update po files

1 files changed, 5145 insertions, 4121 deletions

diff --git a/po/eo.po b/po/eo.po
index d00a5a221..fa5f77d4e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,15 +4,11 @@
 #
 #
 # Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 20, 2009.
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
+"POT-Creation-Date: 2017-01-10 03:06+0000\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -22,76 +18,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Stato"
+
+#: ../data/gui/account_context_menu.ui.h:2
+#, fuzzy
+msgid "_Personal Events"
+msgstr "Persona detalaĵoj"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 #, fuzzy
-msgid "Join _Group Chat..."
+msgid "_Start Chat..."
+msgstr "_Ekparoli"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/chat_context_menu.ui.h:6
+#: ../data/gui/roster_window.ui.h:5 ../data/gui/systray_context_menu.ui.h:3
+msgid "Join _Group Chat"
 msgstr "Eniri en babilejon"
 
-#: ../data/gui/account_context_menu.ui.h:2
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Plenumi komandon..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Korekti konton"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Malfermi poŝtkeston de Gmail"
 
-#: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Persona detalaĵoj"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Ekparoli"
-
 #: ../data/gui/account_context_menu.ui.h:9
 #: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Stato"
+msgid "_Modify Account..."
+msgstr "_Korekti konton..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:3
+#: ../src/config.py:1247 ../src/config.py:1262 ../src/config.py:1267
+#: ../src/config.py:1315 ../src/config.py:1425 ../src/config.py:1755
+#: ../src/config.py:1760 ../src/config.py:2369 ../src/config.py:2451
+#: ../src/config.py:2466 ../src/config.py:3758 ../src/config.py:3835
+#: ../src/dialogs.py:327 ../src/dialogs.py:329 ../src/dialogs.py:537
+#: ../src/dialogs.py:550 ../src/roster_window.py:3086
+#: ../src/roster_window.py:3092 ../src/roster_window.py:3097
+msgid "None"
+msgstr "Neniu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Kontkreilo"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:3
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>Konto estas kreata</b>\n"
-"\n"
-"Bonvolu atendi..."
+"Vi bezonas havi konton por ke konekti\n"
+"al la jaber-reto."
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Mi jam havas konton, mi volas uzi ĝin"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
+msgid "I want to _register for a new account"
+msgstr "Mi volas registri novan konton"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bonvolu elekti unu el sekvaj opcioj:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bonvolu plenigi datumon por via nova konto</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr ""
-
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
 #, fuzzy
@@ -99,241 +113,212 @@ msgid "Anon_ymous authentication"
 msgstr "Uzi aŭtentokontrolon"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Konekti kiam vi premos Finigi"
+#: ../data/gui/accounts_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Password:"
+msgstr "_Pasvorto:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Kontkreilo"
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Save pass_word"
+msgstr "Konservi pasvorton"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-#, fuzzy
-msgid "I already have an account I want to _use"
-msgstr "Mi jam havas konton, mi volas uzi ĝin"
+#: ../data/gui/accounts_window.ui.h:17
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "Mi volas registri novan konton"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Server:"
+msgstr "_Servilo:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-msgid "Manage..."
-msgstr "Administri..."
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Prokura servilo:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
-msgid "None"
-msgstr "Neniu"
+msgid "Manage..."
+msgstr "Administri..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-#, fuzzy
-msgid "Prox_y:"
-msgstr "Prokura servilo:"
+msgid "Use custom hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Konservi pasvorton"
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Servilnomo: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Korekti vian personan informon kiam vi konektitos"
+msgid "_Port:"
+msgstr "_Pordo:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Uzi propran servilnomon/pordon"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Krome"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Vi bezonas havi konton por ke konekti\n"
-"al la jaber-reto."
-
-#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Krome"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Finigi"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
 #, fuzzy
-msgid "_Hostname:"
-msgstr "Servilnomo: "
-
-#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Konto estas kreata</b>\n"
+"\n"
+"Bonvolu atendi..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Pasvorto:"
+msgid "Connect when I press Finish"
+msgstr "Konekti kiam vi premos Finigi"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Pordo:"
+msgid "Set my profile when I connect"
+msgstr "Korekti vian personan informon kiam vi konektitos"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Servilo:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Cetero</b>"
+msgid "_Finish"
+msgstr "_Finigi"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Kontoj"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Persona informo</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3568
+#: ../src/dialogs.py:3614
+msgid "Add"
+msgstr "Aldoni"
 
-#: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Agordo</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3572
+#: ../src/dialogs.py:3669
+msgid "Delete"
+msgstr "Forigi"
 
 #: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Alĝustigi laŭ stato"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Konto"
-
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Kontoj"
+msgid "Re_name"
+msgstr "Re_nomigi"
 
-#: ../data/gui/accounts_window.ui.h:8
-#, fuzzy
-msgid "Administration operations"
-msgstr "Estra listo"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4210
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "Aktiva"
 
 #: ../data/gui/accounts_window.ui.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Uzi aŭtentokontrolon"
+msgid "Resour_ce:"
+msgstr "Risur_cnomo:"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
+msgid "Priori_ty:"
+msgstr "Priori_tato:"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Rigardi"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Risurcnomo estas sendata al jabber-servilo por ke distingi klientojn kun "
+"samaj JID. Do vi povas samtempe konekti per la sama konto kun risurcnomoj "
+"\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
+"ricevos la eventojn."
 
-#: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:12 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1119
+#: ../src/common/helpers.py:1131 ../src/notify.py:327 ../src/notify.py:350
+#: ../src/notify.py:401 ../src/notify.py:417
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Chan_ge Password"
-msgstr "Ŝanĝi _pasvorton"
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Alĝustigi laŭ stato"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
 
 #: ../data/gui/accounts_window.ui.h:15
 #, fuzzy
-msgid "Choose Client Cert"
-msgstr "Elektu dosieron por sendi..."
-
-#: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Elekti _ŝlosilon..."
-
-#: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Klaku por ŝanĝi konta pasvorton"
+msgid "Anonymous authentication"
+msgstr "Uzi aŭtentokontrolon"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
 msgstr ""
+"Prioritato uzatas en Jabber por determini, kiu ricevos eventojn de jabber-"
+"servilo, kiam kelkaj klientoj estas konekta per sama konto. La kliento kun "
+"la plej granda prioritato ricevas eventojn"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Malkorekta salutnomo"
+msgid "Synchronize contacts"
+msgstr "Montri _senkonektajn kontaktojn"
 
 #: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Konekto"
+msgid "Chan_ge Password"
+msgstr "Ŝanĝi _pasvorton"
 
 #: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "Retpoŝtadreso:"
+msgid "Click to change account's password"
+msgstr "Klaku por ŝanĝi konta pasvorton"
 
 #: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "Nomo:"
+#, fuzzy
+msgid "Administration operations"
+msgstr "Estra listo"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
-msgid "General"
-msgstr "Ĝenerala"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Rigardi"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
-"dosiertransmeto havos pli ŝancojn funkcii."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #: ../data/gui/accounts_window.ui.h:27
 #, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
+msgid "Client certificate"
+msgstr "Malkorekta salutnomo"
+
+#: ../data/gui/accounts_window.ui.h:28 ../data/gui/join_groupchat_window.ui.h:2
+msgid "Account"
+msgstr "Konto"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
-"preventas diskonekton pro longa neaktiva tempo"
+msgid "C_onnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -342,6 +327,23 @@ msgid ""
 msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
+
+#: ../data/gui/accounts_window.ui.h:33
+#, fuzzy
+msgid "Synchronize logs with server"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Synch_ronize account status with global status"
+msgstr "Sink_ronigi kontan staton kun komuna stato"
+
+#: ../data/gui/accounts_window.ui.h:35
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -350,111 +352,102 @@ msgstr ""
 "Se markitas, ĉiu ŝanĝo de komuna stato (manipulata per listbutono maldekstre "
 "en la kontaktlista fenestro) samtempe ŝanĝos la staton de tiu ĉi konto."
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se la defaŭlta pordo, kiu uzatas por venantaj mesaĝoj, ne taŭgas por via "
-"agordo, vi povas elekti alian ĉi tie.\n"
-"Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Informo pri vi, kiel estas en la servilo"
-
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Familia nomo:"
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "_Unuigi kontojn"
+msgid "Use file transfer proxies"
+msgstr "Uzi dosiertransmetan prokuran servilon"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "Neniu ŝlosilo elektita"
+#: ../data/gui/accounts_window.ui.h:38
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
+"dosiertransmeto havos pli ŝancojn funkcii."
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Persona informo"
+#. nick choosen by contact
+#. FIXME: Ugly workaround.
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
+#. General group cannot be changed
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:42
+#: ../src/common/contacts.py:106 ../src/common/contacts.py:139
+#: ../src/dialogs.py:124 ../src/dialogs.py:136 ../src/roster_window.py:3028
+#: ../src/roster_window.py:4151 ../src/roster_window.py:5764
+msgid "General"
+msgstr "Ĝenerala"
 
-#: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_tato:"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:41 ../data/gui/preferences_window.ui.h:140
+#, fuzzy
+msgid "_Manage..."
+msgstr "Administri..."
 
 #: ../data/gui/accounts_window.ui.h:42
-msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
-msgstr ""
-"Prioritato uzatas en Jabber por determini, kiu ricevos eventojn de jabber-"
-"servilo, kiam kelkaj klientoj estas konekta per sama konto. La kliento kun "
-"la plej granda prioritato ricevas eventojn"
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
+msgid "_Warn before using an insecure connection"
+msgstr ""
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_nomigi"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Risur_cnomo:"
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Sendi vivkontrolajn pakaĵojn"
 
 #: ../data/gui/accounts_window.ui.h:46
 msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
-"Risurcnomo estas sendata al jabber-servilo por ke distingi klientojn kun "
-"samaj JID. Do vi povas samtempe konekti per la sama konto kun risurcnomoj "
-"\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
-"ricevos la eventojn."
+"se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
+"preventas diskonekton pro longa neaktiva tempo"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
+
+#: ../data/gui/accounts_window.ui.h:48
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Servilnomo: "
 
 #: ../data/gui/accounts_window.ui.h:49
 #, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Sendi vivkontrolajn pakaĵojn"
+msgid "_Port: "
+msgstr "_Pordo:"
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Sink_ronigi kontan staton kun komuna stato"
+#: ../data/gui/accounts_window.ui.h:50 ../data/gui/preferences_window.ui.h:143
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Cetero</b>"
 
 #: ../data/gui/accounts_window.ui.h:51
-#, fuzzy
-msgid "Synchroni_ze account status with global status"
-msgstr "Sink_ronigi kontan staton kun komuna stato"
+msgid "Connection"
+msgstr "Konekto"
 
-#: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Montri _senkonektajn kontaktojn"
+#: ../data/gui/accounts_window.ui.h:52 ../src/config.py:1853
+#: ../src/config.py:2467
+msgid "No key selected"
+msgstr "Neniu ŝlosilo elektita"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
+msgid "Choose _Key..."
+msgstr "Elekti _ŝlosilon..."
 
 #: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
@@ -462,77 +455,131 @@ msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:55
 #, fuzzy
-msgid "Use cust_om hostname/port"
-msgstr "Uzi propran servilnomon/pordon"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
 #: ../data/gui/accounts_window.ui.h:56
-#, fuzzy
-msgid "Use cust_om port:"
-msgstr "Uzi propran pordon:"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Uzi dosiertransmetan prokuran servilon"
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Korekti personan informon..."
 
 #: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+msgid "Information about you, as stored in the server"
+msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/gui/accounts_window.ui.h:59
-#, fuzzy
-msgid "_Edit Personal Information..."
-msgstr "Korekti personan informon..."
+msgid "<b>Personal Information</b>"
+msgstr "<b>Persona informo</b>"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-#, fuzzy
-msgid "_Enable"
-msgstr "Ebligi"
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Persona informo"
 
 #: ../data/gui/accounts_window.ui.h:61
 #, fuzzy
-msgid "_Hostname: "
-msgstr "Servilnomo: "
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
 #, fuzzy
-msgid "_Manage..."
-msgstr "Administri..."
+msgid "Synchroni_ze account status with global status"
+msgstr "Sink_ronigi kontan staton kun komuna stato"
 
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:63
 #, fuzzy
-msgid "_Port: "
-msgstr "_Pordo:"
+msgid "Use cust_om port:"
+msgstr "Uzi propran pordon:"
 
-#: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
+#: ../data/gui/accounts_window.ui.h:64
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
+"Se la defaŭlta pordo, kiu uzatas por venantaj mesaĝoj, ne taŭgas por via "
+"agordo, vi povas elekti alian ĉi tie.\n"
+"Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
+
+#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "First Name:"
+msgstr "Nomo:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr ""
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Last Name:"
+msgstr "Familia nomo:"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "K_onto:"
+#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/archiving_313_preferences_item.ui.h:3
+#: ../data/gui/tooltip_gc_contact.ui.h:1
+#: ../data/gui/tooltip_roster_contact.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:9 ../src/config.py:1880
+#: ../src/dialogs.py:854
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "_Permesi al tiu kontakto vidi mian staton"
+#: ../data/gui/accounts_window.ui.h:69
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "E-Mail:"
+msgstr "Retpoŝtadreso:"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Aldoni novan kontakton"
+#: ../data/gui/accounts_window.ui.h:70
+msgid "Mer_ge accounts"
+msgstr "_Unuigi kontojn"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
+#: ../data/gui/add_new_contact_window.ui.h:1 ../src/common/helpers.py:1317
 msgid "I would like to add you to my contact list."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "Add New Contact"
+msgstr "Aldoni novan kontakton"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "A_ccount:"
+msgstr "K_onto:"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_Protocol:"
+msgstr "_Protokolo:"
+
 #: ../data/gui/add_new_contact_window.ui.h:5
+msgid "_User ID:"
+msgstr "_Uzula ID:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Nickname:"
+msgstr "Kaŝ_nomo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "_Group:"
+msgstr "_Grupo:"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "Choose a group of type a new group"
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid "A_llow this contact to view my status"
+msgstr "_Permesi al tiu kontakto vidi mian staton"
+
+#: ../data/gui/add_new_contact_window.ui.h:10
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Abono"
+
+#: ../data/gui/add_new_contact_window.ui.h:11
+#, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
+"protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
 "Vi devas registriĝi ĉe tiu transportilo por\n"
@@ -540,7 +587,11 @@ msgstr ""
 "protokolo. Klaku la butonon \"Registri\"\n"
 "por fari tion."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:15
+msgid "_Register"
+msgstr "Re_gistri"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -548,41 +599,17 @@ msgstr ""
 "Vi devas konekti al la transportilo por ebligi aldonon\n"
 "de kontakto per tiu protokolo."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Grupo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "Kaŝ_nomo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protokolo:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "Re_gistri"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Abono"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_Uzula ID:"
-
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
+msgid "Please wait while retrieving command list..."
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
@@ -590,351 +617,208 @@ msgid "Check once more"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-#, fuzzy
-msgid "Error description..."
-msgstr "Priskribo"
+msgid "Please wait while the command is being sent..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
-msgid "F_inish"
-msgstr "_Finigi"
+msgid "Please wait..."
+msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
+msgid "This jabber entity does not expose any commands."
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
+msgid "<b>An error has occurred:</b>"
 msgstr ""
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr ""
-
-#: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr ""
+#, fuzzy
+msgid "F_inish"
+msgstr "_Finigi"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
+msgid "Advanced Configuration Editor"
+msgstr "Detala agorda administrilo"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "Filter:"
+msgstr "Filtrilo:"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "<b>Description</b>"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>RIMARKU:</b> Vi devas relanĉi gajim por efektigi kelkajn parametrojn"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "Detala agorda administrilo"
-
-#: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "Filtrilo:"
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Reŝargi kolorojn per defaŭlto"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Forigi tagmesaĝon"
+msgid "Show _XML Console"
+msgstr "Montri _XML-konzolon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Forigas mesaĝon de la tago"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit Archi_ving Preferences"
 msgstr "_Agordo"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Privataj listoj"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administristo"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sendas mesaĝon al uzuloj nuntempe konektitaj al tiu ĉi servilo"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
-msgid "Set MOTD..."
-msgstr "Enigi tagmesaĝon"
+msgid "_Send Server Message..."
+msgstr "_Sendi servilan mesaĝon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Instalas mesaĝon de la tago"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Montri _XML-konzolon"
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Enigi tagmesaĝon"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "Updates Message of the Day"
+msgstr "Renovigas mesaĝon de la tago"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
-msgid "Updates Message of the Day"
-msgstr "Renovigas mesaĝon de la tago"
-
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administristo"
+msgid "Deletes Message of the Day"
+msgstr "Forigas mesaĝon de la tago"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Sendi servilan mesaĝon"
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " iun fenestron/slipon malfermitan kun tiu kontakto "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Agoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Kondiĉoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sonoj</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Kromaj agoj"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Kroma agordo de avizado"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "ia ajn stato"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Fora"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Okupata "
+msgid "Delete MOTD"
+msgstr "Forigi tagmesaĝon"
 
-#: ../data/gui/advanced_notifications_window.ui.h:10
+#: ../data/gui/archiving_313_preferences_item.ui.h:1
+#: ../data/gui/archiving_313_preferences_window.ui.h:1
+#: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
-msgid "Contact Change Status "
-msgstr "Kontakto ŝanĝis sian staton"
+msgid "Always"
+msgstr "Fora"
 
-#: ../data/gui/advanced_notifications_window.ui.h:11
+#: ../data/gui/archiving_313_preferences_item.ui.h:2
+#: ../data/gui/archiving_313_preferences_window.ui.h:3
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
-msgid "Contact Disconnected "
-msgstr "Kontakto malkonektita"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Ne havas "
+msgid "Never"
+msgstr "_Neniam"
 
-#: ../data/gui/advanced_notifications_window.ui.h:13
+#: ../data/gui/archiving_313_preferences_item.ui.h:4
 #, fuzzy
-msgid "File Transfer Finished"
-msgstr "Dosieraj transmetoj"
+msgid "Preference:"
+msgstr "Agordo"
 
-#: ../data/gui/advanced_notifications_window.ui.h:14
+#: ../data/gui/archiving_313_preferences_window.ui.h:2
 #, fuzzy
-msgid "File Transfer Request "
-msgstr "Mendo de dosiera transmeto"
+msgid "Roster"
+msgstr "Montri _kontaktliston"
 
-#: ../data/gui/advanced_notifications_window.ui.h:15
+#. holds jid
+#: ../data/gui/archiving_313_preferences_window.ui.h:4 ../src/dialogs.py:3576
+#: ../src/history_manager.py:168
 #, fuzzy
-msgid "File Transfer Started "
-msgstr "Dosiera transmeto haltitas"
+msgid "Jabber ID"
+msgstr "Jabber-ID:"
 
-#: ../data/gui/advanced_notifications_window.ui.h:16
+#: ../data/gui/archiving_313_preferences_window.ui.h:5
 #, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Emfazado de mesaĝoj en babilejo"
+msgid "Preference"
+msgstr "Agordo"
 
-#: ../data/gui/advanced_notifications_window.ui.h:17
+#: ../data/gui/archiving_313_preferences_window.ui.h:6
 #, fuzzy
-msgid "Group Chat Message Received "
-msgstr "Ricevitas mesaĝo en babilejo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Havas "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Nevidebla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Lanĉi komandon"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Nedisponebla"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "kelka(j) speciala(j) stato(j)..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Enrete / Babilema"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Ludi sonon"
+msgid "Default:"
+msgstr "Defaŭlte"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../data/gui/archiving_preferences_window.ui.h:1
 #, fuzzy
-msgid "Receive a Message"
-msgstr "Nova privata mesaĝo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "Kiam "
+msgid "No"
+msgstr "Neniu"
 
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../data/gui/archiving_preferences_window.ui.h:2
+msgid "Yes"
 msgstr ""
-"_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
-"interparolan fenestron en taskostrio"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Malŝaltas aŭtomatan malfermadon de interparola fenestro"
 
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Malŝalti ekzistan ŝprucfenestron"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Malŝalti ekzistan sonon por tiu ĉi evento"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Malŝalti eventmontron en kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Malŝalti eventmontron en kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Informi min per ŝprucfenestro"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "Malfermi interparolan _fenestron por uzulo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "Montri eventon en _kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "Montri eventon en _kontaktlisto"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "kaj mi "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_preferences_window.ui.h:3
 #, fuzzy
-msgid "contact(s)"
-msgstr "Kontaktoj"
+msgid "Prefer"
+msgstr "Agordo"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
+#: ../data/gui/archiving_preferences_window.ui.h:4
+msgid "Concede"
 msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "por "
+#: ../data/gui/archiving_preferences_window.ui.h:5
+msgid "Forbid"
+msgstr ""
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
+#: ../data/gui/archiving_preferences_window.ui.h:6
 #, fuzzy
-msgid "group(s)"
-msgstr "Grupo"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "dum mi estas je"
+msgid "Auto"
+msgstr "Aŭtomate aliĝi"
 
-#: ../data/gui/archiving_preferences_window.ui.h:1
+#: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Auto</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:2
+#: ../data/gui/archiving_preferences_window.ui.h:8
 msgid "<i>Method Local</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:3
+#: ../data/gui/archiving_preferences_window.ui.h:9
 msgid "<i>Method Manual</i>"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:4
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
-msgid "Auto"
-msgstr "Aŭtomate aliĝi"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
-msgid "Concede"
-msgstr ""
+msgid "New entry received"
+msgstr "Kiam ricevas novan eventon"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
-msgid "Forbid"
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:129
+msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
-msgid "No"
-msgstr "Neniu"
-
-#: ../data/gui/archiving_preferences_window.ui.h:8
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
-msgid "Prefer"
-msgstr "Agordo"
-
-#: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr ""
+msgid "Feed name:"
+msgstr "Etosa nomo"
 
-#: ../data/gui/atom_entry_window.ui.h:1
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "Entry:"
 msgstr "Lando:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
-#, fuzzy
-msgid "Feed name:"
-msgstr "Etosa nomo"
-
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:5
 #, fuzzy
 msgid "Last modified:"
 msgstr "Familia nomo:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-#, fuzzy
-msgid "New entry received"
-msgstr "Kiam ricevas novan eventon"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
 msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
@@ -943,342 +827,389 @@ msgid "Blocked Contacts"
 msgstr "Kontaktoj"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:606
+#: ../src/roster_window.py:5742 ../src/roster_window.py:5857
 msgid "_Unblock"
 msgstr ""
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-#, fuzzy
-msgid "<b>Message:</b> "
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/gui/change_mood_dialog.ui.h:1
+#: ../data/gui/change_activity_dialog.ui.h:3
 #, fuzzy
-msgid "<b>Message:</b>"
+msgid "<b>Message:</b> "
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/gui/change_mood_dialog.ui.h:2
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Sonoj</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:2
+#, fuzzy
+msgid "<b>Message:</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Enigi ĝin denove por konfirmi:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enigu novan pasvorton:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Enigi ĝin denove por konfirmi:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Tajpu vian novan statmesaĝon</b>"
+msgid "Save as Preset..."
+msgstr "Konservi kiel antaŭpreparitaj..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
+msgid "Preset messages:"
+msgstr "Antaŭpreparitaj mesaĝoj:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:7
 #, fuzzy
 msgid "Activity:"
 msgstr "Ŝaltita"
 
-#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/change_status_message_dialog.ui.h:4
+#: ../data/gui/tooltip_roster_contact.ui.h:6
 #, fuzzy
 msgid "Mood:"
 msgstr "Babilejo:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:4
-msgid "Preset messages:"
-msgstr "Antaŭpreparitaj mesaĝoj:"
-
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Konservi kiel antaŭpreparitaj..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Tajpu vian novan statmesaĝon</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Eniri en babilejon"
+msgid "_Copy Link Location"
+msgstr "_Kopii ligilan lokon"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Aldoni al kontaktlisto"
+msgid "_Open Link in Browser"
+msgstr "_Malfermi ligilon per retrigardilo"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Kopii JID/retpoŝtan adreson"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopii ligilan lokon"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Malfermi retpoŝtredaktilon"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Malfermi ligilon per retrigardilo"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "n°"
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Aldoni al kontaktlisto"
+
+#: ../data/gui/chat_control.ui.h:1
+#, fuzzy
+msgid "<b>1</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "<b>2</b> abc"
+msgstr "<b>Sonoj</b>"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "<b>3</b> def"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:4
-msgid "1"
-msgstr ""
+#, fuzzy
+msgid "<b>4</b> ghi"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:5
-msgid "2"
-msgstr ""
+#, fuzzy
+msgid "<b>5</b> jkl"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:6
-msgid "3"
-msgstr ""
+#, fuzzy
+msgid "<b>6</b> mno"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:7
-msgid "4"
+msgid "<b>7</b> pqrs"
 msgstr ""
 
 #: ../data/gui/chat_control.ui.h:8
-msgid "5"
-msgstr ""
+#, fuzzy
+msgid "<b>8</b> tuv"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:9
-msgid "6"
+msgid "<b>9</b> wxyz"
 msgstr ""
 
 #: ../data/gui/chat_control.ui.h:10
-msgid "7"
-msgstr ""
+#, fuzzy
+msgid "<b>*</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:11
-msgid "8"
-msgstr ""
+#, fuzzy
+msgid "<b>0</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/chat_control.ui.h:12
-msgid "9"
-msgstr ""
-
-#: ../data/gui/chat_control.ui.h:13
 #, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Aligas kontakton en kontaktliston"
+msgid "<b>#</b>"
+msgstr "<b>Sonoj</b>"
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:13 ../data/gui/gajim_themes_window.ui.h:10
+msgid "Bold"
+msgstr "Dika"
+
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/gajim_themes_window.ui.h:11
+msgid "Italic"
+msgstr "Kursiva"
 
 #: ../data/gui/chat_control.ui.h:15
 #, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "atentas al la komunikado"
+msgid "Underline"
+msgstr "Substreko"
+
+#: ../data/gui/chat_control.ui.h:16
+#, fuzzy
+msgid "Strike"
+msgstr "Kaŝnomo"
+
+#: ../data/gui/chat_control.ui.h:17 ../src/advanced_configuration_window.py:99
+msgid "Color"
+msgstr "Koloro"
+
+#: ../data/gui/chat_control.ui.h:18
+#, fuzzy
+msgid "Font"
+msgstr "_Tiparo:"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Clear formatting"
+msgstr "Kontakta informo"
 
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/groupchat_control.ui.h:1
 #, fuzzy
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
+#: ../data/gui/chat_control.ui.h:21
 #, fuzzy
-msgid "Show a list of formattings"
-msgstr "Klaku por enigi mienon (Alt+M)"
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Aligas kontakton en kontaktliston"
 
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:22
 #, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Klaku por enigi mienon (Alt+M)"
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "atentas al la komunikado"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:23
+#, fuzzy
+msgid "Show the contact&apos;s profile (Ctrl+I)"
+msgstr "Aligas kontakton en kontaktliston"
+
+#: ../data/gui/chat_control.ui.h:24
 #, fuzzy
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
+#: ../data/gui/chat_control.ui.h:25 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
 msgstr ""
 
-#: ../data/gui/chat_control.ui.h:21
-msgid "Toggle video session"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:26 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "Klaku por enigi mienon (Alt+M)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/chat_control.ui.h:27
+msgid "#"
+msgstr "n°"
+
+#: ../data/gui/chat_control.ui.h:28 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:321
 msgid "_Send"
 msgstr "_Sendi"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:29 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Sendi mesaĝon"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-#, fuzzy
-msgid "In_vite"
-msgstr "In_viti al"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:2
 #, fuzzy
-msgid "MUC server"
-msgstr "Rigardiloj"
+msgid ""
+"You are now entering a groupchat.\n"
+"Select the contacts you want to invite"
+msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-
-#: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "Peti por vidi lian/ŝian staton"
-
-#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
-msgid "Add Special _Notification..."
-msgstr "Aligi specialan _avizon"
+msgid "MUC server"
+msgstr "Rigardiloj"
 
-#: ../data/gui/contact_context_menu.ui.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:6
 #, fuzzy
-msgid "Assign Open_PGP Key..."
-msgstr "Enigi Open_PGP-ŝlosilon"
+msgid "In_vite"
+msgstr "In_viti al"
 
-#: ../data/gui/contact_context_menu.ui.h:4
-#, fuzzy
-msgid "E_xecute Command..."
-msgstr "Plenumi komandon..."
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "Start _Chat"
+msgstr "Ekparoli"
 
-#: ../data/gui/contact_context_menu.ui.h:5
+#. Send single message
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:541
+msgid "Send Single _Message..."
+msgstr "Sendi unuopan _mesaĝon..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
-msgid "Edit _Groups..."
-msgstr "Aranĝi _Grupojn"
+msgid "Send _File..."
+msgstr "Sendi _dosieron"
 
-#. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5832
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktoj"
 
-#: ../data/gui/contact_context_menu.ui.h:8
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
+
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
-msgid "Remo_ve"
-msgstr "_Forigi"
+msgid "Toggle End to End Encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:554
+#: ../src/roster_window.py:5695
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
 
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:574
+#, fuzzy
+msgid "E_xecute Command..."
+msgstr "Plenumi komandon..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Sendi unuopan _mesaĝon..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "Renomigado de kontakto"
 
-#: ../data/gui/contact_context_menu.ui.h:11
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:595
+#: ../src/roster_window.py:5725
 #, fuzzy
-msgid "Send _File..."
-msgstr "Sendi _dosieron"
+msgid "_Rename..."
+msgstr "_Renomigi"
 
-#: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr ""
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5848
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Aranĝi _Grupojn"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Ekparoli"
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Enigi Open_PGP-ŝlosilon"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-#, fuzzy
-msgid "Toggle End to End Encryption"
-msgstr "Baskuli Open_PGP-ĉifradon"
+msgid "Set Custom _Avatar..."
+msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Baskuli Open_PGP-ĉifradon"
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Aligi specialan _avizon"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Abono"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Permesi al li/ŝi vidi vian staton"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "_Permesi al tiu kontakto vidi mian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr ""
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "Peti por vidi lian/ŝian staton"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Malpermesi al li/ŝi vidi vian staton"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_Historio"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:609
+#: ../src/roster_window.py:5747 ../src/roster_window.py:5861
+msgid "_Block"
 msgstr ""
 
 #: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
-msgid "_Manage Contact"
-msgstr "Renomigado de kontakto"
+msgid "_Unignore"
+msgstr "naŭ"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-#, fuzzy
-msgid "_Rename..."
-msgstr "_Renomigi"
+msgid "_Ignore"
+msgstr ""
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Abono"
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:617
+#: ../src/roster_window.py:5754
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Forigi"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-#, fuzzy
-msgid "_Unignore"
-msgstr "naŭ"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:5927
+msgid "_History"
+msgstr "_Historio"
 
 #: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
@@ -1293,54 +1224,52 @@ msgid "Edit Groups"
 msgstr "Aranĝi grupojn"
 
 #: ../data/gui/esession_info_window.ui.h:1
-#, fuzzy
-msgid "(<b>ESession</b> info)"
-msgstr "<b>Priskribo</b>"
-
-#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/gui/features_window.ui.h:2
-msgid "<b>List of possible features in Gajim:</b>"
-msgstr ""
-
-#: ../data/gui/features_window.ui.h:3
+#: ../data/gui/features_window.ui.h:1
 #, fuzzy
 msgid "Features"
 msgstr "Servilaj trajtoj"
 
+#: ../data/gui/features_window.ui.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr ""
+
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
+#, fuzzy
+msgid "Con_tinue"
+msgstr "_Daŭrigi"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Nuligi dosiertransmeton"
+msgid "_Pause"
+msgstr "_Paŭzi"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Nuligas la indikitan dosiertransmeton"
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "_Nuligi"
 
-#: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
+#: ../data/gui/filetransfers.ui.h:4 ../src/chat_control.py:2029
+#: ../src/filetransfers_window.py:214
+msgid "_Open Containing Folder"
+msgstr "_Malfermi enhavantan dosierujon"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Malplenigi"
-
-#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Dosieraj transmetoj"
 
+#: ../data/gui/filetransfers.ui.h:6
+msgid "file transfers list"
+msgstr "dosiertransdonada listo"
+
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Kaŝas la fenestron"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
 #: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Forigi dosiertransmeton el la listo."
+msgid "Clean _up"
+msgstr "Malplenigi"
 
 #: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
@@ -1349,8 +1278,8 @@ msgstr ""
 "listo"
 
 #: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
+msgid "Remove file transfer from the list."
+msgstr "Forigi dosiertransmeton el la listo."
 
 #: ../data/gui/filetransfers.ui.h:11
 msgid ""
@@ -1361,81 +1290,90 @@ msgstr ""
 "aktiva, ĝin unue haltitas kaj poste forigitos."
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Daŭrigi"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Nuligi dosiertransmeton"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Avizi min kiam dosiero estas transdonita"
+msgid "Cancels the selected file transfer"
+msgstr "Nuligas la indikitan dosiertransmeton"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Malfermi enhavantan dosierujon"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Kaŝas la fenestron"
 
 #: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Paŭzi"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Avizi min kiam dosiero estas transdonita"
 
 #: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "dosiertransdonada listo"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Koloroj de babilstataj langetoj</b>"
+#: ../data/gui/filetransfers.ui.h:18
+msgid "Shows a list of file transfers between you and others"
+msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/gajim_themes_window.ui.h:1
 #, fuzzy
 msgid "Account row"
 msgstr "Konto"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Dika"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakto"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Tajpas mesaĝon"
+msgid "Gajim Themes Customization"
+msgstr "Etosa administrado de Gajim"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Kontakto"
+msgid "Text _color:"
+msgstr "Teksta _koloro:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Tipara fasono:"
+msgid "_Background:"
+msgstr "_Fono:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Etosa administrado de Gajim"
+msgid "Text _font:"
+msgstr "Teksta _tiparo:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Foriris"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Grupo"
+msgid "Font style:"
+msgstr "Tipara fasono:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
-msgid "Italic"
-msgstr "Kursiva"
-
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Tajpas mesaĝon"
+
+#: ../data/gui/gajim_themes_window.ui.h:14
+msgid "Paused"
+msgstr "Paŭzas"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "Gone"
+msgstr "Foriris"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
 msgid ""
 "MUC\n"
 "Messages"
@@ -1443,7 +1381,7 @@ msgstr ""
 "Babilejaj\n"
 "Mesaĝoj"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1451,21 +1389,9 @@ msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Paŭzas"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Teksta _koloro:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Teksta _tiparo:"
-
 #: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Fono:"
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 #, fuzzy
@@ -1474,91 +1400,106 @@ msgstr "Ŝanĝi kaŝ_nomon"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
 #, fuzzy
+msgid "_Manage Room"
+msgstr "Aranĝi legosignojn"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
+#, fuzzy
 msgid "Change _Subject..."
 msgstr "Ŝanĝi _temon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 #, fuzzy
 msgid "Configure _Room..."
 msgstr "Administri _babilejon"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Starigi legosignon por tiu babilejo"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 #, fuzzy
 msgid "_Destroy Room"
 msgstr "Priskribo: %s"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:6
+msgid "_Minimize on close"
+msgstr ""
+
 #: ../data/gui/gc_control_popup_menu.ui.h:7
 #, fuzzy
-msgid "_Manage Room"
-msgstr "Aranĝi legosignojn"
+msgid "_Request Voice"
+msgstr "_Voĉo"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8
-msgid "_Minimize on close"
-msgstr ""
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1803
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:10 ../src/roster_window.py:5919
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakto malkonektita"
 
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derigisto"
+msgid "_Send Private Message"
+msgstr "_Sendi privatan mesaĝon"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Send _File"
+msgstr "Sendi _dosieron"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Agoj por babilanto"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
-msgid "Send _File"
-msgstr "Sendi _dosieron"
-
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
+msgid "_Voice"
+msgstr "_Voĉo"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derigisto"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Membro"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Estro"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Malpermesi"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Mastro"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Elpeli"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Membro"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Mastro"
+msgid "_Ban"
+msgstr "_Malpermesi"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Sendi privatan mesaĝon"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voĉo"
+msgid "_Add to Roster"
+msgstr "_Aldoni al kontaktlisto"
 
-#: ../data/gui/groupchat_control.ui.h:1
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:365
 #, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Starigi legosignon por tiu babilejo"
+msgid "Show a list of formattings"
+msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+#, fuzzy
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Ŝanĝi kaŝ_nomon"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr ""
 
-#: ../data/gui/groupchat_control.ui.h:4
+#: ../data/gui/groupchat_control.ui.h:5
 #, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Ŝanĝi kaŝ_nomon"
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Starigi legosignon por tiu babilejo"
 
 #: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
@@ -1566,51 +1507,30 @@ msgid "Create new post"
 msgstr "Nova mesaĝo"
 
 #: ../data/gui/groups_post_window.ui.h:2
-#: ../data/gui/single_message_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:1
 msgid "From:"
 msgstr "De:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Subject:"
 msgstr "Temo:"
 
 #: ../data/gui/history_manager.ui.h:1
 #, fuzzy
-msgid ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-msgstr ""
-"<big><b>Bonvenon al protokoladministrilo de Gajim </b></big>\n"
-"\n"
-"Vi povas elekti protokolojn maldekstre kaj/aŭ serĉi datumbaze malsupre.\n"
-"\n"
-"<b>AVERTO:</b>\n"
-"Se vi planas fari multajn forigojn, bonvolu certiĝi ke Gajim ne aktivas. "
-"Ĝenerale evitu forigojn rilatajn al kontaktoj kun kiu vi interparolas "
-"nuntempe."
+msgid "_Export"
+msgstr "Eksportado"
+
+#: ../data/gui/history_manager.ui.h:2
+msgid "Gajim History Logs Manager"
+msgstr "Gajim administrilo de protokoloj"
 
 #: ../data/gui/history_manager.ui.h:3
 #, fuzzy
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim administrilo de protokoloj"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Forigi"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
-msgstr "Eksportado"
-
-#: ../data/gui/history_manager.ui.h:6
-msgid "Gajim History Logs Manager"
-msgstr "Gajim administrilo de protokoloj"
-
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:4
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1619,173 +1539,186 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:7
+#, fuzzy
+msgid ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<big><b>Bonvenon al protokoladministrilo de Gajim </b></big>\n"
+"\n"
+"Vi povas elekti protokolojn maldekstre kaj/aŭ serĉi datumbaze malsupre.\n"
+"\n"
+"<b>AVERTO:</b>\n"
+"Se vi planas fari multajn forigojn, bonvolu certiĝi ke Gajim ne aktivas. "
+"Ĝenerale evitu forigojn rilatajn al kontaktoj kun kiu vi interparolas "
+"nuntempe."
+
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Serĉi datumbaze"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "ia ajn stato"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1 ../src/history_window.py:337
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
-#: ../data/gui/history_window.ui.h:3
+#: ../data/gui/history_window.ui.h:2
 #, fuzzy
-msgid "Enter JID or Contact name"
-msgstr "Kontaktnomo"
+msgid "Search:"
+msgstr "Serĉi"
+
+#: ../data/gui/history_window.ui.h:3
+msgid "_In date search"
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:4
-#, fuzzy
-msgid "Groupchat Histories"
-msgstr "Babilejoj"
+msgid "Searching only in the selected day "
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:5
-#, fuzzy
-msgid "Search:"
-msgstr "Serĉi"
-
-#: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
+#: ../data/gui/history_window.ui.h:6
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Protokoli statŝanĝojn de kontaktoj"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
+msgid "body"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
-msgid "body"
+msgid "false"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr ""
+#: ../src/common/connection_handlers.py:1221
+msgid "message"
+msgstr "mesaĝo"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
+msgid "stream"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
+msgid "approve"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
+msgid "concede"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "JID"
+msgid "forbid"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "mesaĝo"
+msgid "oppose"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
-msgid "oppose"
+msgid "prefer"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
-msgid "otr"
-msgstr "_Retnodo:"
+msgid "require"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
-msgid "prefer"
-msgstr ""
+#: ../src/gajim-remote.py:231
+msgid "jid"
+msgstr "JID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
-msgid "require"
+msgid "expire"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr ""
+#, fuzzy
+msgid "otr"
+msgstr "_Retnodo:"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
+msgid "save"
 msgstr ""
 
-#: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
-msgid "Bro_wse Rooms"
-msgstr "_Rigardi"
-
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2461
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
+#: ../data/gui/join_groupchat_window.ui.h:3
+msgid "Recently:"
+msgstr "Antaŭ nelonge:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:4
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Antaŭ nelonge:"
-
-#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:6 ../src/config.py:1870
 msgid "Server:"
 msgstr "Servilo:"
 
-#: ../data/gui/join_groupchat_window.ui.h:10
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Password:"
+msgstr "Pasvorto:"
+
+#: ../data/gui/join_groupchat_window.ui.h:8
 #, fuzzy
 msgid "_Bookmark this room"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:9
+#, fuzzy
+msgid "Join this room _automatically when I connect"
+msgstr "Aŭtomate aliĝi al ĉi tiu babilejo kiam vi konektitos"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Rigardi"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:2060
+#: ../src/disco.py:1807
 msgid "_Join"
 msgstr "_Aliĝi"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Aŭtomate aliĝi"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Aranĝi legosignojn"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+#, fuzzy
+msgid "_Title:"
+msgstr "Titolo:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
+msgid "Roo_m:"
 msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "Eligi statojn:"
+#, fuzzy
+msgid "A_uto join"
+msgstr "Aŭtomate aliĝi"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+msgid "Minimi_ze on Auto Join"
+msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Titolo:"
+#, fuzzy
+msgid "Pr_int status:"
+msgstr "Eligi statojn:"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
@@ -1798,45 +1731,46 @@ msgid "_Configure"
 msgstr "_Daŭrigi"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Agordo</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Agordo</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Name:"
+msgstr "_Nomo:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-#, fuzzy
-msgid "Proxy _Host:"
-msgstr "Prokura servilo:"
+msgid "<b>Properties</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
-msgid "Proxy _Port:"
-msgstr "_Pordo:"
+msgid "_BOSH URL:"
+msgstr "_URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Prokura servilo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 #, fuzzy
@@ -1845,100 +1779,87 @@ msgstr "_Uzi prokuran servilon"
 
 #: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
-msgid "Use proxy auth_entication"
-msgstr "Uzi aŭtentokontrolon"
+msgid "Proxy _Port:"
+msgstr "_Pordo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
-msgid "_BOSH URL:"
-msgstr "_URL:"
+msgid "Use proxy auth_entication"
+msgstr "Uzi aŭtentokontrolon"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Nomo:"
+msgid "_Username:"
+msgstr "_Salutnomo:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
+msgid "Pass_word:"
+msgstr "Pas_vorto:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Salutnomo:"
+msgid "<b>Settings</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Administri kontojn"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Pasfrazo"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "_Permesi"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Enrete"
+msgid "Version:"
+msgstr "Versio de GTK+:"
 
 #: ../data/gui/plugins_window.ui.h:5
 #, fuzzy
-msgid "Configure"
-msgstr "_Daŭrigi"
+msgid "Authors:"
+msgstr "_Permesi"
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Priskribo: %s"
+msgid "Homepage:"
+msgstr "Hejmpaĝo:"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
-msgid "Homepage:"
-msgstr "Hejmpaĝo:"
+msgid "Description:"
+msgstr "Priskribo: %s"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
+msgid "Configure"
+msgstr "_Daŭrigi"
+
+#: ../data/gui/plugins_window.ui.h:10
+#, fuzzy
 msgid "Installed"
 msgstr "Malrapidas"
 
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:11
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr ""
 
-#: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:13
-#, fuzzy
-msgid "Version:"
-msgstr "Versio de GTK+:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
-msgstr ""
-
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1950,1134 +1871,1137 @@ msgid "Event desc"
 msgstr "Eventoj"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Detala agorda administrilo</b>"
+msgid "Use default applications"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Programoj</b>"
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Agoj</b>"
+msgid "All chat states"
+msgstr "ia ajn stato"
 
 #: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
-msgid "<b>Auto Status</b>"
-msgstr "<b>Agoj</b>"
-
-#: ../data/gui/preferences_window.ui.h:5
-#, fuzzy
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Redakti regulon</b>"
+msgid "Composing only"
+msgstr "Tajpas mesaĝon"
 
-#: ../data/gui/preferences_window.ui.h:6
-#, fuzzy
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Koloroj de babilstataj langetoj</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:162
+#: ../src/config.py:654
+msgid "Disabled"
+msgstr "malŝaltitaj"
 
 #: ../data/gui/preferences_window.ui.h:7
-#, fuzzy
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Bildavizoj</b>"
+msgid "Only when pending events"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:8
+#: ../data/gui/preferences_window.ui.h:9
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Kondiĉoj</b>"
+msgid "Pop it up"
+msgstr "_Antaŭigi la fenestron"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>Propraj</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Avizi min pri tio"
 
 #: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
-msgid "<b>Font</b>"
-msgstr "<b>Sonoj</b>"
+msgid "Show only in roster"
+msgstr "Montri nur en _kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>Agordo por GMail</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<i>Privataj listoj</i>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:18
+#: ../data/gui/preferences_window.ui.h:17
 #, fuzzy
-msgid "<b>Status Messages</b>"
-msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
+msgid "Last state"
+msgstr "Lasta stato: %s"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "Preferences"
+msgstr "Agordo"
 
 #: ../data/gui/preferences_window.ui.h:19
-#, fuzzy
-msgid "<b>Themes</b>"
-msgstr "<b>Agordo</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Aldoni regulon</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Bildavizoj</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name, in roster window and in group chats"
 msgstr ""
+"Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
+"la kontaktlisto kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Krome"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
-msgid "Advanced..."
-msgstr "Krome"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:25
 #, fuzzy
-msgid "All chat states"
-msgstr "ia ajn stato"
+msgid "Sort contacts by status"
+msgstr "_Ordigi kontaktojn per stato"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Ebligi sendi informon pri _OS"
+#, fuzzy
+msgid "in _roster"
+msgstr "Mankas en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:27
 #, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Ebligi sendi informon pri _OS"
+msgid "in _group chats"
+msgstr "Eniri en babilejon"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
+msgid "<b>Roster Appearance</b>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 msgstr ""
+"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
+"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
 #: ../data/gui/preferences_window.ui.h:30
 #, fuzzy
-msgid "Always"
-msgstr "Fora"
+msgid "_Emoticons:"
+msgstr "Mienoj:"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Demandi statmesaĝon kiam mi:"
-
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
+msgid "_Window behavior:"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Montri _kontaktliston"
+
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+#, fuzzy
+msgid "Ma_ke message windows compact"
+msgstr "_Unu mesaĝfenestro:"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+#, fuzzy
+msgid "Hide all buttons in chat windows"
+msgstr "Kaŝas la butonojn en babileja fenestro."
 
 #: ../data/gui/preferences_window.ui.h:35
 #, fuzzy
-msgid "Chat message:"
-msgstr "_Statmesaĝo:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignori formatadon en venantaj mesaĝoj"
 
 #: ../data/gui/preferences_window.ui.h:36
-#, fuzzy
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
+"markitas, Gajim simple montros krudan mesaĝan tekston."
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Tajpas mesaĝon"
+msgid "_Highlight misspelled words"
+msgstr "_Emfazi misskribajn vortojn"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Agordo de koloro kaj tiparo de la fasado"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "_Statmesaĝo:"
+msgid "Show icon when your messages are received"
+msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Kontaktnomo"
+msgid "Show avatar in chat tabs"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:41
 #, fuzzy
-msgid "Custom"
-msgstr "<b>Propraj</b>"
-
-#: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Redakti regulon</b>"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kiam ricevas novan eventon"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr ""
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "malŝaltitaj"
+#: ../data/gui/preferences_window.ui.h:46
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
+"ekrano pri kontaktoj kiu ĵus elsalutis"
 
 #: ../data/gui/preferences_window.ui.h:47
-#, fuzzy
-msgid "Display _activity of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Montri _kromajn detalojn pri retleteroj"
+#, fuzzy
+msgid "Allow popup/notifications when a chat window is opened"
+msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Notify on new _GMail email"
+msgstr "Avizi pri novaj _Gmail-leteroj"
 
 #: ../data/gui/preferences_window.ui.h:50
 #, fuzzy
-msgid "Display _tunes of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid "Display _extra email details"
+msgstr "Montri _kromajn detalojn pri retleteroj"
 
 #: ../data/gui/preferences_window.ui.h:52
 #, fuzzy
-msgid "Display m_ood of contacts in roster"
-msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
+msgid "<b>GMail Options</b>"
+msgstr "<b>Agordo por GMail</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
-msgstr ""
-"Gajim povas sendi kaj ricevi meta-informon rilatan al konversacio, kiun vi "
-"povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
-"montri en interparolaj fenestroj."
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Uzi pletpiktogramon"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
-msgstr ""
-"Gajim povas sendi kaj ricevi informon rilatan al interparolado kun kontakto. "
-"Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
-"interparolanto."
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Bildavizoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:56
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr ""
-"Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
-"ekrano pri kontaktoj kiu ĵus elsalutis"
+msgid "Play _sounds"
+msgstr "Ludi _sonojn"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Ma_nage..."
+msgstr "Admi_nistri..."
 
 #: ../data/gui/preferences_window.ui.h:58
-#, fuzzy
-msgid "Hide all buttons in chat windows"
-msgstr "Kaŝas la butonojn en babileja fenestro."
+msgid "Allow sound when I'm _busy"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:59
-#, fuzzy
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
+msgid "<b>Sounds</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
+#, fuzzy
+msgid "Notifications"
+msgstr "Konta korektado"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
 msgstr ""
+"Gajim povas sendi kaj ricevi meta-informon rilatan al konversacio, kiun vi "
+"povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
+"montri en interparolaj fenestroj."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
 
 #: ../data/gui/preferences_window.ui.h:63
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+"Gajim can 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 ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+"Gajim povas sendi kaj ricevi informon rilatan al interparolado kun kontakto. "
+"Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
+"interparolanto."
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
-"la kontaktlisto kaj en babilejoj"
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Montrataj babilstataj _avizoj:"
 
 #: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Bildavizoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:66
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+msgid "Personal Events"
+msgstr "Persona detalaĵoj"
 
 #: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
+msgid "_Away after:"
+msgstr "Aŭtomate _fora post:"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
-"fenestro kaj en babilejoj"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
+#, fuzzy
+msgid "_Not available after:"
+msgstr "Aŭtomate nedisponebla post:"
 
 #: ../data/gui/preferences_window.ui.h:70
-#, fuzzy
 msgid ""
-"If checked, Gajim will ignore incoming events from unauthorized contacts. "
-"Use with caution, because it blocks all messages from any contact that is "
-"not in the roster"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
-"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
-"kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
-msgstr ""
+msgid "minutes"
+msgstr "minutoj"
 
 #: ../data/gui/preferences_window.ui.h:72
-#, fuzzy
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
-
-#: ../data/gui/preferences_window.ui.h:73
-msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
-msgstr ""
-"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
-"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
-"fora, okupata ktp...)"
-
-#: ../data/gui/preferences_window.ui.h:74
 msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:75
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
-"ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
-
-#: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:77
-#, fuzzy
-msgid "Ma_ke message windows compact"
-msgstr "_Unu mesaĝfenestro:"
-
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Admi_nistri..."
+msgid "12"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
-msgid "Never"
-msgstr "_Neniam"
+msgid "20"
+msgstr "0"
 
 #: ../data/gui/preferences_window.ui.h:80
 #, fuzzy
-msgid "Notifications"
-msgstr "Konta korektado"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Agoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:81
-#, fuzzy
-msgid "Notify me about contacts that sign _in"
-msgstr "Avizi min pri kontaktoj kiuj: "
+msgid "Ask status message when I:"
+msgstr "Demandi statmesaĝon kiam mi:"
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
-msgid "Notify me about contacts that sign _out"
-msgstr "Avizi min pri kontaktoj kiuj: "
+msgid "Sign _in"
+msgstr "E_nsalutas"
 
 #: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Avizi min pri tio"
+msgid "Sign _out"
+msgstr "E_lsalutas"
 
 #: ../data/gui/preferences_window.ui.h:84
-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/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr ""
+msgid "Status"
+msgstr "Stato"
 
 #: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
-msgid "Personal Events"
-msgstr "Persona detalaĵoj"
+msgid "Default Message"
+msgstr "Defaŭlta statmesaĝo"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Ludi _sonojn"
+#, fuzzy
+msgid "Enabled"
+msgstr "Ebligi"
 
 #: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
-msgid "Pop it up"
-msgstr "_Antaŭigi la fenestron"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Agordo"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr ""
+#, fuzzy
+msgid "Chat message:"
+msgstr "_Statmesaĝo:"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Use system _default"
+msgstr "Uzi sisteman defaŭlton"
 
 #: ../data/gui/preferences_window.ui.h:92
 #, fuzzy
-msgid "STUN server:"
-msgstr "Servilo:"
+msgid "<b>Font</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Show notification area icon:"
-msgstr "Uzi pletpiktogramon"
+msgid "T_heme:"
+msgstr "_Etoso:"
 
 #: ../data/gui/preferences_window.ui.h:94
 #, fuzzy
-msgid "Show only in roster"
-msgstr "Montri nur en _kontaktlisto"
+msgid "Status _iconset:"
+msgstr "Defaŭlta stata p_iktogramaro:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "E_nsalutas"
+#, fuzzy
+msgid "Use _transports icons"
+msgstr "Uzi _transportilajn piktogramarojn"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "E_lsalutas"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from ICQ will have the equivalent ICQ icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Se markitas, Gajim uzos protokolo-specifajn statpiktogramojn. (ekzemple "
+"kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
+"fora, okupata ktp...)"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Agordo de koloro kaj tiparo de la fasado"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
-"markitas, Gajim simple montros krudan mesaĝan tekston."
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/preferences_window.ui.h:99
 #, fuzzy
-msgid "Sort contacts by status"
-msgstr "_Ordigi kontaktojn per stato"
+msgid "Contact's nickname:"
+msgstr "Kontaktnomo"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Stato"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Contact's message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/gui/preferences_window.ui.h:101
-#, fuzzy
-msgid "Status _iconset:"
-msgstr "Defaŭlta stata p_iktogramaro:"
+msgid "_Status message:"
+msgstr "_Statmesaĝo:"
 
 #: ../data/gui/preferences_window.ui.h:102
 #, fuzzy
-msgid "Style"
-msgstr "Malrapidas"
+msgid "Group chat highlight:"
+msgstr "Emfazado de mesaĝoj en babilejo"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "_Etoso:"
+#, fuzzy
+msgid "Your nickname:"
+msgstr "Antaŭ kaŝnomo:"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
+#, fuzzy
+msgid "Your message:"
+msgstr "Erara mesaĝo: %s"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "_URL highlight:"
 msgstr ""
 
+#: ../data/gui/preferences_window.ui.h:106
+msgid "_Reset to Default Colors"
+msgstr "_Reŝargi kolorojn per defaŭlto"
+
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+#, fuzzy
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Koloroj de babilstataj langetoj</b>"
+
+#: ../data/gui/preferences_window.ui.h:108
+#, fuzzy
+msgid "Style"
+msgstr "Malrapidas"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Audio input device"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:110
-#, fuzzy
-msgid "Use _transports icons"
-msgstr "Uzi _transportilajn piktogramarojn"
+msgid "Audio output device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr ""
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Agoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Uzi sisteman defaŭlton"
+msgid "Video input device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
+msgid "Video output device"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:114
-msgid "Video input device"
+msgid "Video framerate"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:115
-msgid "Video output device"
+msgid "Video size"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:116
-msgid "Video size"
+msgid "View own video source"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:117
 #, fuzzy
-msgid "When new event is received:"
-msgstr "Kiam ricevas novan eventon"
+msgid "<b>Video</b>"
+msgstr "<b>Aldoni regulon</b>"
 
 #: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
-msgid "Your message:"
-msgstr "Erara mesaĝo: %s"
+msgid "STUN server:"
+msgstr "Servilo:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "Antaŭ kaŝnomo:"
-
-#: ../data/gui/preferences_window.ui.h:120
-#, fuzzy
-msgid "_Away after:"
-msgstr "Aŭtomate _fora post:"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:121
-msgid "_Browser:"
-msgstr "_Rigardilo:"
+msgid "<i>(example: stun.iptel.org)</i>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:122
 #, fuzzy
-msgid "_Display chat state notifications:"
-msgstr "Montrataj babilstataj _avizoj:"
+msgid "<b>Connection</b>"
+msgstr "<b>Kondiĉoj</b>"
 
-#: ../data/gui/preferences_window.ui.h:123
-#, fuzzy
-msgid "_Emoticons:"
-msgstr "Mienoj:"
+#: ../data/gui/preferences_window.ui.h:123 ../src/features_window.py:93
+msgid "Audio / Video"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "_Dosieradministrilo:"
+msgid "_Mail client:"
+msgstr "Ret_poŝtkliento:"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Emfazi misskribajn vortojn"
+msgid "_Browser:"
+msgstr "_Rigardilo:"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
-
-#: ../data/gui/preferences_window.ui.h:127
-#, fuzzy
-msgid "_Ignore rich content in incoming messages"
-msgstr "Ignori formatadon en venantaj mesaĝoj"
+msgid "_File manager:"
+msgstr "_Dosieradministrilo:"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "_Protokoli statŝanĝojn de kontaktoj"
+msgid "<b>Custom</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "Ret_poŝtkliento:"
+msgid "<b>Applications</b>"
+msgstr "<b>Programoj</b>"
 
 #: ../data/gui/preferences_window.ui.h:130
-#, fuzzy
-msgid "_Not available after:"
-msgstr "Aŭtomate nedisponebla post:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Malfermi..."
+#, fuzzy
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Marku tiun opcion, nur se iu ne el via kontaktlisto spamas/ĉagrenas vin. Uzu "
+"singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
+"kontaktlisto"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Reŝargi kolorojn per defaŭlto"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
 #: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
-msgid "_Send chat state notifications:"
-msgstr "Montrataj babilstataj _avizoj:"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
 #: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Statmesaĝo:"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr ""
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
+msgid "Log _encrypted chat session"
 msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:137
-#, fuzzy
-msgid "in _group chats"
-msgstr "Eniri en babilejon"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
-msgid "in _roster"
-msgstr "Mankas en kontaktlisto"
+msgid "Allow my _idle time to be sent"
+msgstr "Ebligi sendi informon pri _OS"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutoj"
+msgid "Global proxy:"
+msgstr ""
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "Privataj listoj:"
+#: ../data/gui/preferences_window.ui.h:141
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privataj listoj</i>"
+
+#: ../data/gui/preferences_window.ui.h:142
+msgid "_Log status changes of contacts"
+msgstr "_Protokoli statŝanĝojn de kontaktoj"
+
+#: ../data/gui/preferences_window.ui.h:144
+msgid "_Open..."
+msgstr "_Malfermi..."
+
+#: ../data/gui/preferences_window.ui.h:145
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Detala agorda administrilo</b>"
+
+#: ../data/gui/preferences_window.ui.h:146
+msgid "Advanced"
+msgstr "Krome"
 
 #: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Aldoni / Redakti regulon</b>"
+#, fuzzy
+msgid "none"
+msgstr "unu"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>Listo de reguloj</b>"
+#, fuzzy
+msgid "both"
+msgstr "Ambaŭ"
 
 #: ../data/gui/privacy_list_window.ui.h:3
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:4
+#, fuzzy
+msgid "to"
+msgstr "du"
+
+#: ../data/gui/privacy_list_window.ui.h:5 ../src/dialogs.py:4325
+msgid "Privacy List"
+msgstr "Privata listo"
+
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privataj listoj</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Active for this session"
 msgstr "Aktiva dum la kuranta seanco"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Active on each startup"
 msgstr "Aktiva dum ĉiu lanĉo"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "Ĉiuj"
+#: ../data/gui/privacy_list_window.ui.h:9
+msgid "<b>List of rules</b>"
+msgstr "<b>Listo de reguloj</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
-#, fuzzy
-msgid "All (including subscription)"
-msgstr "ĉiuj laŭ abonado"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Aldoni / Redakti regulon</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Allow"
 msgstr "Permesi"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:12
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "JabberID"
 msgstr "Jabber-ID"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Ordnumero:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privata listo"
-
-#: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "ĉiuj laŭ abonado"
-
 #: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "ĉiuj en la grupo"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Ambaŭ"
+msgid "all by subscription"
+msgstr "ĉiuj laŭ abonado"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "De"
+msgid "All"
+msgstr "Ĉiuj"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "unu"
-
-#: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "du"
-
-#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "sendi mesaĝojn al mi"
 
-#: ../data/gui/privacy_list_window.ui.h:20
+#: ../data/gui/privacy_list_window.ui.h:18
 msgid "to send me queries"
 msgstr "sendi informmendojn al mi"
 
-#: ../data/gui/privacy_list_window.ui.h:21
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to view my status"
+msgstr "vidi mian staton"
+
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me status"
 msgstr "sendi staton al mi"
 
+#: ../data/gui/privacy_list_window.ui.h:21
+#, fuzzy
+msgid "All (including subscription)"
+msgstr "ĉiuj laŭ abonado"
+
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "vidi mian staton"
+msgid "Order:"
+msgstr "Ordnumero:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-#, fuzzy
-msgid "<b>Address</b>"
-msgstr "<b>Aldoni regulon</b>"
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "Privataj listoj:"
 
 #: ../data/gui/profile_window.ui.h:2
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
-msgid "<b>Avatar:</b>"
-msgstr "Kaŝbildeto:"
+msgid "<b>Name:</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-#, fuzzy
-msgid "<b>Birthday:</b>"
-msgstr "Naskiĝtago:"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:16
 #, fuzzy
-msgid "<b>City:</b>"
-msgstr "<b>Propraj</b>"
+msgid "<b>Nickname:</b>"
+msgstr "Kaŝnomo:"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-#, fuzzy
-msgid "<b>Company:</b>"
-msgstr "<b>Propraj</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
-msgid "<b>Country:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Family:</b>"
+msgstr "Familia nomo:"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-#, fuzzy
-msgid "<b>Department:</b>"
-msgstr "Fako:"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:36
 #, fuzzy
-msgid "<b>E-Mail:</b>"
-msgstr "Retpoŝtadreso:"
+msgid "<b>Given:</b>"
+msgstr "<b>OpenPGP</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
-msgid "<b>Extra Address:</b>"
-msgstr "Kroma adreso:"
+msgid "<b>Middle:</b>"
+msgstr "<b>Aldoni regulon</b>"
 
-#. Family Name
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:34
 #, fuzzy
-msgid "<b>Family:</b>"
-msgstr "Familia nomo:"
+msgid "<b>Prefix:</b>"
+msgstr "<b>Agordo</b>"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:38
+#, fuzzy
+msgid "<b>Suffix:</b>"
+msgstr "<b>Sonoj</b>"
+
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:39
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Propraj</b>"
 
-#. Given Name
-#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/profile_window.ui.h:15
 #: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
-msgid "<b>Given:</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "<b>Street:</b>"
+msgstr "<b>Agordo</b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:20
 #, fuzzy
-msgid "<b>Homepage:</b>"
-msgstr "Hejmpaĝo:"
+msgid "<b>Extra Address:</b>"
+msgstr "Kroma adreso:"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
-msgid "<b>Middle:</b>"
-msgstr "<b>Aldoni regulon</b>"
+msgid "<b>City:</b>"
+msgstr "<b>Propraj</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
-msgid "<b>Name:</b>"
-msgstr "<b>Propraj</b>"
+msgid "<b>Postal Code:</b>"
+msgstr "Poŝtkodo:"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
-msgid "<b>Nickname:</b>"
-msgstr "Kaŝnomo:"
+msgid "<b>State:</b>"
+msgstr "<b>Agordo</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
-msgid "<b>Phone No.:</b>"
-msgstr "Telefono:"
+msgid "<b>Country:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
-msgid "<b>Position:</b>"
-msgstr "<b>Kondiĉoj</b>"
+msgid "<b>Address</b>"
+msgstr "<b>Aldoni regulon</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
-msgid "<b>Postal Code:</b>"
-msgstr "Poŝtkodo:"
+msgid "<b>Homepage:</b>"
+msgstr "Hejmpaĝo:"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:25
+#, fuzzy
+msgid "<b>E-Mail:</b>"
+msgstr "Retpoŝtadreso:"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
-msgid "<b>Prefix:</b>"
-msgstr "<b>Agordo</b>"
+msgid "<b>Phone No.:</b>"
+msgstr "Telefono:"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
 #, fuzzy
-msgid "<b>Role:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Avatar:</b>"
+msgstr "Kaŝbildeto:"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-#, fuzzy
-msgid "<b>State:</b>"
-msgstr "<b>Agordo</b>"
+msgid "Click to set your avatar"
+msgstr "Klaku por starigi vian kaŝbildon"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "Format: YYYY-MM-DD"
+msgstr "Formato: JJJJ-MM-TT"
+
+#: ../data/gui/profile_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
-msgid "<b>Street:</b>"
-msgstr "<b>Agordo</b>"
+msgid "<b>Birthday:</b>"
+msgstr "Naskiĝtago:"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Persona informo"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
-msgid "<b>Suffix:</b>"
-msgstr "<b>Sonoj</b>"
+msgid "<b>Company:</b>"
+msgstr "<b>Propraj</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "Pri si"
+#: ../data/gui/vcard_information_window.ui.h:43
+#, fuzzy
+msgid "<b>Department:</b>"
+msgstr "Fako:"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Klaku por starigi vian kaŝbildon"
+#: ../data/gui/vcard_information_window.ui.h:44
+#, fuzzy
+msgid "<b>Position:</b>"
+msgstr "<b>Kondiĉoj</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Formato: JJJJ-MM-TT"
+#, fuzzy
+msgid "<b>Role:</b>"
+msgstr "<b>Sonoj</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Persona informo"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Laboro"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>Kion vi volas fari?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "Pri si"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Forigi konton el Gajim kaj el _servilo"
 
-#. Remove group
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Kion vi volas fari?</b>"
+
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5869
 msgid "_Remove"
 msgstr "_Forigi"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
-
-#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_O kej"
 
-#: ../data/gui/roster_window.ui.h:1
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "_Agoj"
+
+#: ../data/gui/roster_window.ui.h:6
 #, fuzzy
 msgid "Add _Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: ../data/gui/roster_window.ui.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Servilaj trajtoj"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "Dosieraj _transmetoj"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1518
+msgid "_Edit"
+msgstr "A_dministri"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Oftaj demandoj (rete)"
+#: ../data/gui/roster_window.ui.h:10
+#, fuzzy
+msgid "_Accounts"
+msgstr "Kontoj"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Helpo reta"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "_Vizitkarto"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "_Vizitkarto"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_Vido"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/roster_window.ui.h:15
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Montri _senkonektajn kontaktojn"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:352
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/gui/roster_window.ui.h:14
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontoj"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "Dosieraj _transmetoj"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Agoj"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Helpo"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
+msgid "Help online"
+msgstr "Helpo reta"
+
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Contents"
 msgstr "_Enhavo"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "A_dministri"
+#: ../data/gui/roster_window.ui.h:23
+msgid "Frequently Asked Questions (online)"
+msgstr "Oftaj demandoj (rete)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:24
 msgid "_FAQ"
 msgstr "_Respondaro"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Helpo"
+#: ../data/gui/roster_window.ui.h:25
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/roster_window.ui.h:23
+#: ../data/gui/roster_window.ui.h:26
 #, fuzzy
-msgid "_Send Single Message..."
-msgstr "Sendi unuopan _mesaĝon..."
+msgid "Fea_tures"
+msgstr "Servilaj trajtoj"
 
-#: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_Vido"
+#: ../data/gui/search_window.ui.h:1 ../src/disco.py:1375
+msgid "Search"
+msgstr "Serĉi"
 
-#: ../data/gui/search_window.ui.h:1
+#: ../data/gui/search_window.ui.h:2
 msgid "Please wait while retrieving search form..."
 msgstr ""
 
-#: ../data/gui/search_window.ui.h:2
-msgid "Search"
-msgstr "Serĉi"
-
 #: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:627
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5
 msgid "_Search"
 msgstr "_Serĉi"
 
 #: ../data/gui/service_discovery_window.ui.h:1
-msgid "G_o"
-msgstr "Ek"
-
-#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adreso:"
 
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "G_o"
+msgstr "Ek"
+
 #: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registri ĉe"
 
-#: ../data/gui/service_registration_window.ui.h:2
-msgid "_Cancel"
-msgstr "_Nuligi"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Respondi al tiu mesaĝo"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "To:"
+msgstr "Al:"
 
 #: ../data/gui/single_message_window.ui.h:4
-msgid "Sen_d"
-msgstr "Sen_di"
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Sendi mesaĝon"
+msgid "Sen_d"
+msgstr "Sen_di"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Sendi mesaĝon kaj fermi fenestron"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Respondi"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "Al:"
+msgid "Reply to this message"
+msgstr "Respondi al tiu mesaĝo"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Respondi"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Sendi kaj fermi"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Sendi mesaĝon kaj fermi fenestron"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "_Permesi"
+msgid "Subscription Request"
+msgstr "Mendo de abono"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Permesi al kontakto koni kiam vi konektas"
+msgid "_Deny"
+msgstr "_Rifuzi"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -3086,198 +3010,234 @@ msgid ""
 msgstr ""
 "Rifuzi abonon de kontakto, do li aŭ ŝi ne povos scii kiam vi estas konektita"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Mendo de abono"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "_Permesi"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Rifuzi"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Permesi al kontakto koni kiam vi konektas"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
+msgid "Synchronise : select contacts"
+msgstr ""
+
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-msgid "Synchronise : select contacts"
-msgstr ""
-
 #: ../data/gui/systray_context_menu.ui.h:1
+msgid "Sta_tus"
+msgstr "Sta_to"
+
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Montri ĉiujn nelegitajn _eventojn"
+
+#: ../data/gui/systray_context_menu.ui.h:6
 msgid "Mute Sounds"
 msgstr "Silentigi sonojn"
 
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Sendi unuopan _mesaĝon"
+#: ../data/gui/tooltip_gc_contact.ui.h:2
+#: ../data/gui/tooltip_roster_contact.ui.h:2
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "Resource:"
+msgstr "Risurco:"
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Montri ĉiujn nelegitajn _eventojn"
+#: ../data/gui/tooltip_roster_contact.ui.h:3
+#: ../data/gui/zeroconf_information_window.ui.h:4
+msgid "Status:"
+msgstr "Stato:"
 
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Sta_tus"
-msgstr "Sta_to"
+#: ../data/gui/tooltip_roster_contact.ui.h:4
+#, fuzzy
+msgid "Idle since:"
+msgstr " ekde %s"
 
-#: ../data/gui/systray_context_menu.ui.h:5
-msgid "_Group Chat"
-msgstr "_Babilejo"
+#: ../data/gui/tooltip_roster_contact.ui.h:5
+#, fuzzy
+msgid "Idle for:"
+msgstr "XML-konzolo por %s"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:8
 #, fuzzy
-msgid "<b>Ask:</b>"
-msgstr "<b>Agoj</b>"
+msgid "Tune:"
+msgstr "Tipo:"
 
-#: ../data/gui/vcard_information_window.ui.h:6
+#: ../data/gui/tooltip_roster_contact.ui.h:9
 #, fuzzy
-msgid "<b>Client:</b>"
-msgstr "<b>Propraj</b>"
+msgid "Location:"
+msgstr "Konta korektado"
 
-#: ../data/gui/vcard_information_window.ui.h:8
+#: ../data/gui/tooltip_roster_contact.ui.h:10
 #, fuzzy
-msgid "<b>Contact time:</b>"
-msgstr "<b>Agordo</b>"
+msgid "OpenPGP:"
+msgstr "OpenPGP: "
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/tooltip_roster_contact.ui.h:11
+msgid "Subscription:"
+msgstr "Abono:"
+
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Kontakta informo"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber-ID:"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risurco:"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Agordo</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
-msgid "<b>Subscription:</b>"
-msgstr "<b>Priskribo</b>"
+msgid "<b>Client:</b>"
+msgstr "<b>Propraj</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Komentoj"
+#: ../data/gui/vcard_information_window.ui.h:7
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Agordo</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
-msgid "Configured avatar:"
+msgid "<b>User avatar:</b>"
+msgstr "Kaŝbildeto:"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Administri _babilejon"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:11
+#, fuzzy
+msgid "<b>Ask:</b>"
+msgstr "<b>Agoj</b>"
+
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:13
+#, fuzzy
+msgid "<b>Subscription:</b>"
+msgstr "<b>Priskribo</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Kontakta informo"
-
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "More"
-msgstr "Plu"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "button"
+msgstr ""
 
-#: ../data/gui/vcard_information_window.ui.h:48
-#, fuzzy
-msgid "User avatar:"
-msgstr "Kaŝbildeto:"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Komentoj"
 
 #: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Sonoj</b>"
-
-#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-trafiko</b>"
 
+#. XML Console enable checkbutton
 #: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML enigo</b>"
+#, fuzzy
+msgid "_Enable"
+msgstr "Ebligi"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Informo/Peto (Info/Query)"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sonoj</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/gui/xml_console_window.ui.h:14
-msgid "_Message"
-msgstr "_Mesaĝo"
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Informo/Peto (Info/Query)"
 
-#: ../data/gui/xml_console_window.ui.h:15
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_Presence"
 msgstr "_Ĉeesto"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
-msgid "_Modify Account..."
-msgstr "_Korekti konton..."
+#: ../data/gui/xml_console_window.ui.h:14
+msgid "_Message"
+msgstr "_Mesaĝo"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML enigo</b>"
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Loka JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:11
 msgid "Personal"
 msgstr "Persona"
 
-#: ../data/gui/zeroconf_information_window.ui.h:8
-msgid "Resource:"
-msgstr "Risurco:"
-
-#: ../data/gui/zeroconf_information_window.ui.h:9
-msgid "Status:"
-msgstr "Stato:"
+#: ../data/gajim-remote.desktop.in.in.h:1
+msgid "Open URI using Gajim"
+msgstr ""
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+bazita jabber-kliento"
+#: ../data/gajim-remote.desktop.in.in.h:2 ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+msgstr ""
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim tujmesaĝilo"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber-tujmesaĝilo"
 
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "GTK+bazita jabber-kliento"
+
 #: ../src/adhoc_commands.py:323
 #, fuzzy
 msgid "Cancel confirmation"
@@ -3298,7 +3258,7 @@ msgstr "Malkorekta rikordo"
 msgid "The form is not filled correctly."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:414
 msgid "Service sent malformed data"
 msgstr ""
 
@@ -3306,298 +3266,247 @@ msgstr ""
 msgid "Service changed the session identifier."
 msgstr ""
 
+#: ../src/adhoc_commands.py:419
+#, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr ""
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:514
 msgid "Service returned an error."
 msgstr ""
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Activated"
 msgstr "Ŝaltita"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Deactivated"
 msgstr "Malŝaltita"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:96
 msgid "Boolean"
 msgstr "Bulea"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:97
 msgid "Integer"
 msgstr "Entjera"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:98
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
-msgid "Color"
-msgstr "Koloro"
-
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:110
 msgid "Preference Name"
 msgstr "Parametra nomo"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:117
 msgid "Value"
 msgstr "Valoro"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:126
 msgid "Type"
 msgstr "Datumtipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(Mankas)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:312
 msgid "Hidden"
 msgstr "Kaŝita"
 
-#: ../src/atom_window.py:123
-#, python-format
-msgid "You have received new entries (and %d not displayed):"
-msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] ""
-msgstr[1] ""
-
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "Angla"
-
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belorusa"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgara"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Bretona"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Ĉeĥa"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "Germana"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greka"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "Brita"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Hispana"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Eŭska"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "Franca"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Kroata"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Itala"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norvega (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Nederlanda"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norvega"
+#: ../src/application.py:49
+#, fuzzy
+msgid "Show the application's version"
+msgstr "Uzi pletpiktogramon"
 
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Pola"
+#: ../src/application.py:52
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Montri nur en _kontaktlisto"
 
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portugala"
+#: ../src/application.py:55
+msgid "Separate profile files completely (even history db and plugins)"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazila Portugala"
+#: ../src/application.py:59
+msgid "Print xml stanzas and other debug information"
+msgstr ""
 
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Rusa"
+#: ../src/application.py:63
+msgid "Print stdout/stderr to the console on Windows"
+msgstr ""
 
-#: ../src/chat_control.py:76
+#: ../src/application.py:67
 #, fuzzy
-msgid "Serbian"
-msgstr "Germana"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovaka"
+msgid "Use defined profile in configuration directory"
+msgstr "Detala agorda administrilo"
 
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Sveda"
+#: ../src/application.py:71
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Agordo de babilejo"
 
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Ĉina (Ch)"
+#: ../src/application.py:74
+msgid "Configure logging system"
+msgstr ""
 
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Lingvo de literumado"
+#: ../src/application.py:119 ../src/chat_control.py:1671
+#: ../src/common/connection.py:550 ../src/common/connection_handlers.py:1079
+#: ../src/common/connection_handlers.py:1255
+#: ../src/common/connection_handlers_events.py:956 ../src/common/logger.py:1177
+#: ../src/session.py:110
+msgid "Database Error"
+msgstr ""
 
-#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
-msgid "A connection is not available"
-msgstr "Konekto mankas"
+#: ../src/application.py:121 ../src/common/connection.py:551
+#: ../src/common/connection_handlers.py:1080
+#: ../src/common/connection_handlers.py:1256
+#: ../src/common/connection_handlers_events.py:957 ../src/common/logger.py:1178
+#: ../src/session.py:111
+#, 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/chat_control.py:529 ../src/chat_control.py:738
-msgid "Your message can not be sent until you are connected."
-msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
+#: ../src/atom_window.py:124
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:307 ../src/chat_control.py:911
 #, fuzzy
-msgid "Underline"
-msgstr "Substreko"
+msgid "OpenPGP encryption enabled"
+msgstr "Ĉifrado ebligata"
 
-#: ../src/chat_control.py:945
-#, fuzzy
-msgid "Strike"
-msgstr "Kaŝnomo"
+#: ../src/chat_control.py:369
+msgid "Formattings are not available when GPG is active"
+msgstr ""
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:372
 #, fuzzy
-msgid "Font"
-msgstr "_Tiparo:"
+msgid "This contact does not support HTML"
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:977
-#, fuzzy
-msgid "Clear formating"
-msgstr "Kontakta informo"
+#. Add to roster
+#: ../src/chat_control.py:377 ../src/common/contacts.py:156
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:282 ../src/dialogs.py:1121 ../src/dialogs.py:2352
+#: ../src/dialogs.py:2381 ../src/dialogs.py:3595 ../src/gui_interface.py:493
+#: ../src/gui_menu_builder.py:292 ../src/gui_menu_builder.py:446
+#: ../src/roster_window.py:791 ../src/roster_window.py:1757
+#: ../src/roster_window.py:1759 ../src/roster_window.py:2093
+#: ../src/roster_window.py:3556 ../src/roster_window.py:3583
+msgid "Not in Roster"
+msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1055
-msgid "Really send file?"
+#. change tooltip text for audio and video buttons if farstream is
+#. not installed
+#: ../src/chat_control.py:402
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
 msgstr ""
 
-#: ../src/chat_control.py:1056
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
+#: ../src/chat_control.py:403
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
 msgstr ""
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
+#: ../src/chat_control.py:405
 #, fuzzy
-msgid "GPG encryption enabled"
-msgstr "Ĉifrado ebligata"
+msgid "Feature not available, see Help->Features"
+msgstr "La aŭtomate nedisponebla statmesaĝo"
 
-#. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
-msgid "Not in Roster"
-msgstr "Mankas en kontaktlisto"
+#: ../src/chat_control.py:409
+msgid "Feature not supported by remote client"
+msgstr ""
 
-#: ../src/chat_control.py:1575
+#: ../src/chat_control.py:422
+#, fuzzy
+msgid "Send files"
+msgstr "Sendi dosieron"
+
+#: ../src/chat_control.py:428
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:431
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:549
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:649 ../src/profile_window.py:214 ../src/vcard.py:210
+#: ../src/vcard.py:576
+#, fuzzy
+msgid "Save _As"
+msgstr "Havas "
+
+#: ../src/chat_control.py:753
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:891 ../src/dialogs.py:5403
+msgid "No OpenPGP key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:892
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:901
 #, fuzzy
-msgid "GPG encryption disabled"
+msgid "OpenPGP encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:927
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:929
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:952
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:956
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3605,66 +3514,66 @@ msgstr "Uzi aŭtentokontrolon"
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2062
+#: ../src/chat_control.py:963
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:1102
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:1112
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2217
+#: ../src/chat_control.py:1114
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:1123
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:1126
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:1128
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:1133
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:1135
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:1184 ../src/chat_control.py:1198
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:1190
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:1488
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:1490
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3672,152 +3581,475 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
-msgid "Database Error"
+#: ../src/chat_control.py:1521 ../src/groupchat_control.py:1390
+#, python-format
+msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:1672
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:1704
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Temo: %s\n"
+"%s"
+
+#: ../src/chat_control.py:1883 ../src/gui_interface.py:1197
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/chat_control.py:1940
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
+#: ../src/chat_control.py:1999
+#, fuzzy
+msgid "File transfer"
+msgstr "Dosieraj transmetoj"
+
+#: ../src/chat_control.py:2002
+#, fuzzy
+msgid "Size"
+msgstr "Longo: %s"
+
+#: ../src/chat_control.py:2004
+#, fuzzy
+msgid "_Accept"
+msgstr "Akcepti"
+
+#: ../src/chat_control.py:2025 ../src/filetransfers_window.py:212
+msgid "File transfer completed"
+msgstr "Dosiertransmeto plenumitas"
+
+#: ../src/chat_control.py:2057 ../src/dialogs.py:2983 ../src/dialogs.py:4830
+#: ../src/gui_interface.py:665 ../src/notify.py:289
+msgid "Groupchat Invitation"
+msgstr "Babileja invitilo"
+
+#: ../src/chat_control.py:2079 ../src/gui_interface.py:1040
+#: ../src/roster_window.py:2016
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/chat_control.py:2081 ../src/gui_interface.py:1043
+#: ../src/roster_window.py:2018
+#, fuzzy
+msgid "Error opening file"
+msgstr "Eraro dum legado de dosiero:"
+
+#: ../src/chat_control.py:2083 ../src/filetransfers_window.py:247
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Dosiera transmeto haltitas"
+
+#: ../src/chat_control.py:2086 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:234
+msgid "File transfer cancelled"
+msgstr "Dosiera transmeto nuligitas"
+
+#: ../src/chat_control.py:2087 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:235
+msgid "Connection with peer cannot be established."
+msgstr "Konekto kun punkto neestableblas."
+
+#. Example string. Do not translate
+#: ../src/command_system/implementation/custom.py:106
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:72
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+#, fuzzy
+msgid "Hide the chat buttons"
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s ne trovitas"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:270
+#: ../src/tooltips.py:913
+msgid "Away"
+msgstr "Fora"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Enrete"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Baskuli Open_PGP-ĉifradon"
+
+#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Sendi dosieron al kontakto"
+
+#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s ne estas valida protokola detalnivelo"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "Konekto mankas"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Konekto mankas"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Ŝanĝi kaŝ_nomon"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3439
+#: ../src/dialogs.py:2195
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Malkorekta salutnomo"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
+"specifita persono."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
+"specifita persono."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Sendi %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "Al vi oni malpermesis esti en la babilejo."
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Malkorekta salutnomo"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "Aparteneco:"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:164 ../src/command_system/mapping.py:174
+#: ../src/command_system/mapping.py:194
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Mankas argumento \"kontakt-jid\""
+
+#: ../src/command_system/mapping.py:261
+msgid "Excessive arguments"
+msgstr ""
+
 #: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:248
+#, fuzzy, python-format
+msgid "moving %s to %s"
+msgstr "Sendi %s"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:316 ../src/common/check_paths.py:323
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s estas dosiero sed devas esti dosierujo"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: ../src/common/check_paths.py:351
-#, python-format
-msgid "creating %s directory"
-msgstr "kreas dosierujon %s"
-
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontakta informo"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 #, fuzzy
 msgid "Change status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Free for chat"
 msgstr "Babilema"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Online"
 msgstr "naŭ"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ne malhelpu."
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 #, fuzzy
 msgid "Presence description:"
 msgstr "Priskribo"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:329
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Nova babilejo"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py:135
+#: ../src/common/helpers.py:73 ../src/roster_window.py:844
+#: ../src/roster_window.py:1761 ../src/roster_window.py:1763
+#: ../src/roster_window.py:2629 ../src/roster_window.py:5655
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d nelegita mesaĝo"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr " %d nelegita mesaĝo"
 
+#: ../src/common/config.py:74
+msgid ""
+"Show desktop notification even when a chat window is opened for this contact "
+"and does not have focus"
+msgstr ""
+
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr ""
@@ -3840,7 +4072,7 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Aŭtomate fora"
 
 #: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
 
 #: ../src/common/config.py:84
@@ -3853,7 +4085,7 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Nedisponebla pro longa senfarado"
 
 #: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr ""
 
 #: ../src/common/config.py:88
@@ -3861,69 +4093,125 @@ msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:89
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:94
 #, fuzzy
 msgid "Incoming nickname color."
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:95
 msgid "Outgoing nickname color."
 msgstr ""
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
 msgid "Incoming text color."
 msgstr ""
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
 msgid "Outgoing text color."
 msgstr ""
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
 #, fuzzy
 msgid "Status message text color."
 msgstr "statmesaĝa teksto"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "Montri eventon en _kontaktlisto"
+
+#. limegreen
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "Montri eventon en _kontaktlisto"
+
+#. red
+#: ../src/common/config.py:103
+msgid "New message/email notification color."
+msgstr ""
+
+#. dodgerblue
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "Mendo de dosiera transmeto"
+
+#. khaki
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "Dosiera transmeto nuligitas"
+
+#. firebrick
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
+
+#. yellowgreen
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Babileja invitilo"
+
+#. tan1
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Background color of status changed notification"
+msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
+
+#. thistle2
+#: ../src/common/config.py:109
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:110
 #, fuzzy
 msgid "Incoming nickname font."
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:111
 #, fuzzy
 msgid "Outgoing nickname font."
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:112
 msgid "Incoming text font."
 msgstr ""
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:113
 msgid "Outgoing text font."
 msgstr ""
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:114
 #, fuzzy
 msgid "Status message text font."
 msgstr "statmesaĝa teksto"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:115
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py:116 ../src/common/config.py:537
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:500
+#: ../src/common/optparser.py:534 ../src/gui_interface.py:2850
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:122
 msgid "Language used by speller"
 msgstr "Lingvo uzata de literumilo"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:123
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3933,7 +4221,7 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:124
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3944,18 +4232,18 @@ msgstr ""
 "preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
 "'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:127
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:128
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:131
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3965,7 +4253,7 @@ msgstr ""
 "elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:140
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3973,7 +4261,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:141
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3983,6 +4271,16 @@ msgstr ""
 
 #: ../src/common/config.py:159
 msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:165
+msgid "Place the roster on the right in single window mode"
+msgstr ""
+
+#: ../src/common/config.py:172
+msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
@@ -3992,50 +4290,60 @@ msgstr ""
 "vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr ""
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4043,11 +4351,11 @@ msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4056,11 +4364,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -4072,14 +4380,14 @@ msgstr ""
 "listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
 "la stato de la retkonekto."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -4087,7 +4395,7 @@ msgstr ""
 "Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -4095,33 +4403,35 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -4130,28 +4440,34 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -4159,17 +4475,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4178,14 +4494,7 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: ../src/common/config.py:222
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
-"lanĉo."
-
-#: ../src/common/config.py:223
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4193,7 +4502,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4201,11 +4510,11 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:255
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:256
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4213,7 +4522,7 @@ msgstr ""
 "Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
 "lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:257
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -4221,9 +4530,10 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:258
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
@@ -4234,29 +4544,33 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:260
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid "Background color of contacts when they just signed in."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed out."
 msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:264
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:265
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:266
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:267
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4266,7 +4580,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:269
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -4277,7 +4591,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:272
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4286,7 +4600,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Administras fenestron kien novaj mesaĝoj metitas:\n"
@@ -4297,32 +4611,40 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:273
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:274
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:275
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:276
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:277
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:278
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:279
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:280
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -4330,27 +4652,27 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:281
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:282
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:283
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:284
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:285
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4358,7 +4680,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:286
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4367,7 +4689,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:287
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4376,7 +4698,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:288
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -4386,24 +4708,7 @@ msgstr ""
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: ../src/common/config.py:262
-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:263
-#, fuzzy
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-msgstr ""
-"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
-"pasvortojn."
-
-#: ../src/common/config.py:264
+#: ../src/common/config.py:289
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4411,7 +4716,7 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:290
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4419,91 +4724,109 @@ msgstr ""
 "Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
 "venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:292
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:293
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:294
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:295
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:296
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:297
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:298
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:299
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:304
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:305
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:306
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:309
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
 msgstr ""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:310
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:311
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:312
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:313
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:314
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:315
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+
+#: ../src/common/config.py:316
+msgid "Show a mini avatar in chat window tabs and in window icon"
+msgstr ""
+
+#: ../src/common/config.py:330
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4511,84 +4834,110 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:338
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:339
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:341
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:342
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:345
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:347
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:348
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:349
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+msgid ""
+"List (space separated) of authentication mechanisms to try. Can contain "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+msgstr ""
+
+#: ../src/common/config.py:353
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:354
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:355
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:358
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:364
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:365
+msgid ""
+"Download logs stored on server on Gajim startup if server supports XEP-0136 "
+"or XEP-0313"
+msgstr ""
+
+#: ../src/common/config.py:366
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:369
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:374
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:381
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4596,141 +4945,192 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:382
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:396
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:406
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
+
+#: ../src/common/config.py:407
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s volas sendi dosieron al vi."
+
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:411
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:412
 msgid "Last time we syncronized with logs from server."
 msgstr ""
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:413
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:414
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:415
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../src/common/config.py:416
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../src/common/config.py:417
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:418
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:419
+msgid "Last MAM id we are syncronized with"
+msgstr ""
+
+#: ../src/common/config.py:481
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:482
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:483 ../src/common/config.py:486
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "'all' aŭ spacetseparitaj statoj"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', aŭ 'both'"
+#: ../src/common/config.py:487
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' aŭ ''"
+#: ../src/common/config.py:488
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr ""
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:491
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:496 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:515 ../src/config.py:1656
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:530
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4738,356 +5138,316 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:540 ../src/common/optparser.py:318
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:544 ../src/common/optparser.py:304
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Neeblas ŝargi senfaran modulon"
-
-#: ../src/common/connection_handlers.py:127
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
-
-#: ../src/common/connection_handlers.py:134
-#, fuzzy
-msgid "Registration succeeded"
-msgstr "Vizitkarto estas sukcese publicita"
-
-#: ../src/common/connection_handlers.py:135
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:143
-#, fuzzy
-msgid "Registration failed"
-msgstr "Konektado malsukcesis"
-
-#: ../src/common/connection_handlers.py:143
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
+#: ../src/common/config.py:559
 #, fuzzy
-msgid "Invisibility not supported"
-msgstr "Kromaĵo ne subtenatas"
-
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Malkorekta jabber-ID"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr ""
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
+msgid "Tor"
+msgstr "Al"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:98
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:99
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:100
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:101
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:102
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:103
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:104
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:105
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:279 ../src/common/connection.py:289
+#: ../src/common/connection_handlers_events.py:1156
+#: ../src/common/connection_handlers_events.py:1202 ../src/config.py:2176
+#: ../src/config.py:2185 ../src/config.py:2253 ../src/config.py:3722
+#: ../src/dataforms_widget.py:642 ../src/dialogs.py:3302
+msgid "Invalid Jabber ID"
+msgstr "Malkorekta jabber-ID"
+
+#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/dialogs.py:3303
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:313
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:316
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:374
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:441
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
+#: ../src/common/connection.py:547 ../src/common/connection_handlers.py:340
+#: ../src/common/connection_handlers.py:1077
+#: ../src/common/connection_handlers.py:1253
+#: ../src/common/connection_handlers_events.py:953 ../src/common/logger.py:1175
+#: ../src/session.py:107
+msgid "Disk Write Error"
 msgstr ""
-"Temo: %s\n"
-"%s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:978
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:979
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:990
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:1032
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:869
-#, fuzzy, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Nekonata versio de D-BUS: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1049
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1050
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1177
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "Uzi propran servilnomon/pordon"
+
+#: ../src/common/connection.py:1359
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1362
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "Ne povas konekti al \"%s\""
+
+#: ../src/common/connection.py:1364 ../src/common/connection.py:1557
+#: ../src/gui_interface.py:551
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1369
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1384
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1422 ../src/common/connection.py:1532
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1423 ../src/common/connection.py:1533
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1457
 #, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1460
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1462
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Kontrolu vian konekton aŭ provu denove poste"
+#: ../src/common/connection.py:1508
+#, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr ""
+
+#: ../src/common/connection.py:1556 ../src/common/connection.py:2351
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1592
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1593
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1669
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1670
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5096,68 +5456,239 @@ msgstr ""
 "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
 "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:1863 ../src/common/connection.py:1977
+#, fuzzy
+msgid "Invisibility not supported"
+msgstr "Kromaĵo ne subtenatas"
+
+#: ../src/common/connection.py:1864 ../src/common/connection.py:1978
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr ""
+
+#: ../src/common/connection.py:2215
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2218
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2368 ../src/common/connection.py:2390
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:3001
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:3002
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/connection_handlers.py:89
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Neeblas ŝargi senfaran modulon"
+
+#: ../src/common/connection_handlers.py:124
+#, 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:132
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Vizitkarto estas sukcese publicita"
+
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:142
+#, fuzzy
+msgid "Registration failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/common/connection_handlers.py:143
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1948
+msgid "I would like to add you to my roster."
+msgstr "Mi volus aldoni vin al mia kontaktlisto."
+
+#: ../src/common/connection_handlers_events.py:393
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. Uzu "
+"kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
+
+#: ../src/common/connection_handlers_events.py:871
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "ordono pri abona fino de %s"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:978
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Permeso estas forigita"
+
+#: ../src/common/connection_handlers_events.py:986
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1157
+#: ../src/common/connection_handlers_events.py:1203
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1246 ../src/gui_interface.py:441
+#: ../src/gui_interface.py:455
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "eraro dum sendado %s ( %s )"
+
+#: ../src/common/connection_handlers_events.py:1485
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1851
+#, fuzzy, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Nekonata versio de D-BUS: %s"
+
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Single Message"
+msgstr "Nova unuobla mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2485
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova unuopa mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2974
+#: ../src/notify.py:278
+msgid "New Private Message"
+msgstr "Nova privata mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2491
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova privata mesaĝo de babilejo %s"
+
+#: ../src/common/connection_handlers_events.py:2494
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2497
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2501 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Message"
+msgstr "Nova mesaĝo"
+
+#: ../src/common/connection_handlers_events.py:2503
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova mesaĝo de %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2669
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s ŝanĝis staton"
+
+#: ../src/common/connection_handlers_events.py:2671
+#: ../src/groupchat_control.py:215 ../src/groupchat_control.py:1909
+#: ../src/history_window.py:472
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s nun estas %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2675 ../src/dialogs.py:2985
+#: ../src/notify.py:291
+msgid "Contact Changed Status"
+msgstr "Kontakto ŝanĝis sian staton"
+
+#: ../src/common/connection_handlers_events.py:2677
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s ensalutis"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2681 ../src/dialogs.py:2969
+#: ../src/notify.py:273
+msgid "Contact Signed In"
+msgstr "Kontakto ensalutis"
+
+#: ../src/common/connection_handlers_events.py:2683
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s elsalutis"
+
+#: ../src/common/connection_handlers_events.py:2687 ../src/dialogs.py:2971
+#: ../src/notify.py:275
+msgid "Contact Signed Out"
+msgstr "Kontakto elsalutis"
+
+#: ../src/common/contacts.py:133 ../src/common/helpers.py:73
+#: ../src/gui_interface.py:493
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#. Invite to
+#: ../src/common/contacts.py:137 ../src/common/contacts.py:365
+#: ../src/common/helpers.py:73 ../src/disco.py:129 ../src/disco.py:130
+#: ../src/disco.py:1514 ../src/roster_window.py:883
+#: ../src/roster_window.py:1643 ../src/roster_window.py:1753
+#: ../src/roster_window.py:1755 ../src/roster_window.py:1918
+#: ../src/roster_window.py:2597 ../src/roster_window.py:5685
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:373
 msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
@@ -5172,7 +5703,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servo nedisponeblas: Gajim ne aktivas, aŭ opcio remote_control estas False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:57
 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."
 
@@ -5194,430 +5725,458 @@ msgstr ""
 "Seancbuso nedisponeblas.\n"
 "Provu legi http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "twelve"
 msgstr "dekdu"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "one"
 msgstr "unu"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "two"
 msgstr "du"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "three"
 msgstr "tri"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "four"
 msgstr "kvar"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "five"
 msgstr "kvin"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "six"
 msgstr "ses"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "seven"
 msgstr "sep"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "eight"
 msgstr "ok"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "nine"
 msgstr "naŭ"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "ten"
 msgstr "dek"
 
-#: ../src/common/fuzzyclock.py:40
+#: ../src/common/fuzzyclock.py:39
 msgid "eleven"
 msgstr "dekunu"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "%(0)s o'clock"
 msgstr "la %(0)sa horo"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "five past %(0)s"
 msgstr "kvin minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "ten past %(0)s"
 msgstr "dek minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "kvarono post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "dudek minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "dudek kvin minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
 msgstr "la %(0)sa kaj duono"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "dudek kvin minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "dudek minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "kvarono antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "ten to %(1)s"
 msgstr "dek minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "five to %(1)s"
 msgstr "kvin minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "la %(1)sa horo"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:50
 msgid "Night"
 msgstr "Nokto"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Early morning"
 msgstr "Frua mateno"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Morning"
 msgstr "Mateno"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Almost noon"
 msgstr "Preskaŭ tagmezo"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Noon"
 msgstr "Tagmezo"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Afternoon"
 msgstr "Posttagmezo"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Evening"
 msgstr "Vespero"
 
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:50
 msgid "Late evening"
 msgstr "Malfrua vespero"
 
-#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:52
 msgid "Start of week"
 msgstr "Komenco de semajno"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:53
 msgid "Middle of week"
 msgstr "Mezo de semajno"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "End of week"
 msgstr "Fino de semajno"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:179
 msgid "Username must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:184
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:190
 msgid "Server must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:195
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:197
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:201
 msgid "Resource must be between 1 and 1023 chars"
 msgstr ""
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:206
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:246
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:248 ../src/tooltips.py:915
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:251
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:253 ../src/tooltips.py:917
+msgid "Not Available"
+msgstr "Nedisponebla"
+
+#: ../src/common/helpers.py:256
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:258 ../src/tooltips.py:911
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:261
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paŭzas"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:263 ../src/tooltips.py:909
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paŭzas"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:265
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:268
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:273
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:275 ../src/tooltips.py:919
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:278
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:280
+msgid "Invisible"
+msgstr "Nevidebla"
+
+#: ../src/common/helpers.py:284
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:286
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:291
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:293
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:295
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:297
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:305
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:307
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:316
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:319
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:321
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:324
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:326
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:329
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:331
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:337 ../src/tooltips.py:403
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:339 ../src/tooltips.py:409
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:341 ../src/tooltips.py:407
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:343 ../src/tooltips.py:405
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:382
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:384
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:386
 msgid "is composing a message..."
 msgstr "tajpas mesaĝon..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:389
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:391
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:597
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:600
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:604
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:607
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:611
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:614
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1069 ../src/common/helpers.py:1076
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: ../src/common/helpers.py:1121
-#, python-format
-msgid " from room %s"
-msgstr ""
+#: ../src/common/helpers.py:1083
+#, fuzzy, python-format
+msgid "from room %s"
+msgstr "Mi estas %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1086 ../src/common/helpers.py:1103
 #, python-format
-msgid " from user %s"
+msgid "from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1126
-#, python-format
-msgid " from %s"
-msgstr ""
+#: ../src/common/helpers.py:1088
+#, fuzzy, python-format
+msgid "from %s"
+msgstr "De"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1095 ../src/common/helpers.py:1101
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1133
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1319
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1433 ../src/common/helpers.py:1442
+#: ../src/common/helpers.py:1501
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/common/helpers.py:1452 ../src/common/helpers.py:1499
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/common/helpers.py:1463
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "%s ne estas valida protokola detalnivelo"
+
+#: ../src/common/helpers.py:1503
+#, fuzzy
+msgid "Error loading image"
+msgstr "Ne povas alŝuti bildon"
+
+#: ../src/common/jingle_rtp.py:115
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Agordo de babilejo"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:116
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5629,115 +6188,129 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:221
 msgid "GStreamer error"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:221
 #, fuzzy, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:355
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:358
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:415
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:422
 msgid "video output"
 msgstr ""
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/common/logging_helpers.py:33
+#: ../src/common/logging_helpers.py:32
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:40
 #, fuzzy
-msgid " Default device"
+msgid "Default device"
 msgstr "Defaŭlta statmesaĝo"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:59
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:62
+#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:92
+#: ../src/common/multimedia_helpers.py:110
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:80
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Longo: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:82
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Dosiero: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:76
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:89
 msgid "Video test"
 msgstr ""
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:94
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:97
+#, fuzzy
+msgid "Screen"
+msgstr "verda"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:104
+msgid "Fake video output"
+msgstr ""
+
+#: ../src/common/multimedia_helpers.py:107
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:109
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:55 ../src/gtkgui_helpers.py:215
+#: ../src/gtkgui_helpers.py:231
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "eraro: %s nedisponeblas por legi"
+msgid "Error: cannot open %s for reading"
+msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:313 ../src/common/optparser.py:314
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:393
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
-#: ../src/common/passwords.py:123
+#: ../src/common/passwords.py:100
 #, fuzzy, python-format
 msgid "XMPP account %s@%s"
 msgstr "de konto %s"
@@ -6439,51 +7012,133 @@ msgstr ""
 msgid "Writing"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "Defaŭlte"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "mara"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Elpelatas %s"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Konto"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Konto"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Priskribo"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Eraro de Avahi"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "unu"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "babilejo"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:341
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:344
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:347
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:350
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Neeblas aliĝi al pordo %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
-"estos nuligita."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6492,76 +7147,65 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:396
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
-#: ../src/common/zeroconf/zeroconf_bonjour.py:191
+#: ../src/common/zeroconf/zeroconf_avahi.py:221
+#: ../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:397
-#, fuzzy
-msgid "Default Message"
-msgstr "Defaŭlta statmesaĝo"
-
-#: ../src/config.py:406
-#, fuzzy
-msgid "Enabled"
-msgstr "Ebligi"
-
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:449 ../src/config.py:453 ../src/config.py:3218
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:724 ../src/dialogs.py:1530
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:734
+#: ../src/config.py:725
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6570,7 +7214,7 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1213
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
@@ -6579,205 +7223,206 @@ msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py:1559 ../src/dialogs.py:2725 ../src/dialogs.py:2792
+#: ../src/dialogs.py:3579 ../src/disco.py:912 ../src/disco.py:1747
+#: ../src/disco.py:2035 ../src/history_window.py:94
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1666
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1667
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1827 ../src/config.py:1962
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:2007 ../src/config.py:2057
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1934
+#: ../src/config.py:2008
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2038
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2039
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2052 ../src/config.py:2628 ../src/config.py:2666
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2053
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2058
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2064
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2065
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2069 ../src/config.py:2074
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2070
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2075
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2156
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2157
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2187
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2425 ../src/config.py:3768
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2426 ../src/config.py:3769
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2448
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2449
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2487
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2488
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2496
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2497
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py:2504 ../src/dialogs.py:2412 ../src/dialogs.py:2713
+#: ../src/dialogs.py:2903 ../src/disco.py:529 ../src/profile_window.py:375
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2505
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2510
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2511
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2629 ../src/config.py:2667
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2636
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2637
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2798
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2800
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2836
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2838
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2902 ../src/disco.py:919 ../src/history_manager.py:219
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2912
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2919
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2925
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2952
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2954
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6785,11 +7430,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2956
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2957
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6797,11 +7442,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2959
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2960
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6809,11 +7454,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2962
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2963
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6821,7 +7466,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2964
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6838,115 +7483,110 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3064
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3079
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3080
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:3093 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:748
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:3094 ../src/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3095 ../src/gui_interface.py:748
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3105
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3106
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3120
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3121
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3122
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3123
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3095
+#: ../src/config.py:3218
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3219
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3220
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3280
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3316
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3317
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Malkorekta salutnomo"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3440 ../src/config.py:3456 ../src/config.py:3467
+#: ../src/config.py:3495
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3455 ../src/config.py:3466 ../src/config.py:3744
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3494
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3658
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3659 ../src/config.py:3665
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6956,34 +7596,34 @@ msgstr ""
 "Vi povas agordi kromajn kontajn parametrojn alklakinte la butonon \"Krome\" "
 "aŭ pli poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3664
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3702
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3704
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3745
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3801 ../src/gui_interface.py:1351
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3802 ../src/gui_interface.py:1352
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3734
+#: ../src/config.py:3895
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6993,89 +7633,90 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3901 ../src/gui_interface.py:1382
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
+"%s\n"
+"SHA256 fingerprint of the certificate:\n"
 "%s"
 msgstr ""
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3934 ../src/config.py:3968
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3871
+#: ../src/config.py:4033
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3872
+#: ../src/config.py:4034
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4164
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/config.py:3992
+#: ../src/config.py:4165
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
-#: ../src/config.py:4036
-msgid "Active"
-msgstr "Aktiva"
+#: ../src/config.py:4193
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Daŭrigi"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4218
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4252
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "Unua mesaĝo ricevita"
+
+#: ../src/config.py:4253
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4254
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4256
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4257
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4258
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4259
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4260
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4261
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4262
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/conversation_textview.py:601
-msgid ""
-"This icon indicates that this message has not yet\n"
-"been received by the remote end. If this icon stays\n"
-"for a long time, it's likely the message got lost."
-msgstr ""
-
-#: ../src/conversation_textview.py:620
+#: ../src/conversation_textview.py:351
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -7084,242 +7725,266 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:657
+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 ""
+
+#. show clear
+#: ../src/conversation_textview.py:761 ../src/profile_window.py:220
+msgid "_Clear"
+msgstr ""
+
+#: ../src/conversation_textview.py:772
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:780
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:794
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:799
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:816
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:830
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:833
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:839
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
+#: ../src/conversation_textview.py:1221
+#, fuzzy
+msgid "Invalid URL"
+msgstr "Malkorekta jabber-ID"
+
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1444
 #, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Hieraŭ"
 msgstr[1] "Hieraŭ"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1532 ../src/history_window.py:507
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:587
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:602
 msgid "This field is required"
 msgstr ""
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:646
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:647
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:661 ../src/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:93
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktnomo: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:95
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:209
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:216
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:309
 msgid "KeyID"
 msgstr "Ŝlosil-ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:314
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:492
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:613
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:627
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:817
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:818
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:826
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:827
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:855
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:856
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:857
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:858
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:859
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:873
-#, python-format
-msgid "Please fill in the data of the contact you want to add in account %s"
+#: ../src/dialogs.py:896
+#, fuzzy, python-format
+msgid ""
+"Please fill in the data of the contact you want\n"
+"to add to your account <b>%s</b>"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:899
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1096 ../src/dialogs.py:1102 ../src/dialogs.py:1107
+#: ../src/dialogs.py:3814
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1103
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1108
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1122
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1123
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1176 ../src/dialogs.py:1210
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "GTK+ jabber-kliento"
+#: ../src/dialogs.py:1308
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+bazita jabber-kliento"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1309
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1191
-msgid "PyGTK Version:"
+#: ../src/dialogs.py:1309
+#, fuzzy
+msgid "PyGobject Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1310
+msgid "python-nbxmpp Version:"
+msgstr ""
+
+#: ../src/dialogs.py:1321
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1323
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1329
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1335
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1347
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1531
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7330,107 +7995,162 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1876 ../src/dialogs.py:1892 ../src/gui_interface.py:1502
+#: ../src/gui_interface.py:1544
+#, fuzzy
+msgid "Insecure connection"
+msgstr "Konekto"
+
+#: ../src/dialogs.py:1877
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
+
+#: ../src/dialogs.py:1883 ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1547
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/dialogs.py:1884
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1885 ../src/groupchat_control.py:2187
+#: ../src/gui_interface.py:725 ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1548 ../src/message_window.py:240
+#: ../src/roster_window.py:2986 ../src/roster_window.py:3666
+#: ../src/roster_window.py:4495
+#, fuzzy
+msgid "_Do not ask me again"
+msgstr "_Ne plu demandi"
+
+#: ../src/dialogs.py:1984
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1992
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2196 ../src/dialogs.py:2661
 #, fuzzy
-msgid "The nickname has not allowed characters."
+msgid "The nickname contains invalid characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2319
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2322
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2407 ../src/gui_interface.py:2143
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2413
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2459
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy
+msgid "Wrong server"
+msgstr "Malprava uri"
+
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "Tio ne estas babilejo"
+
+#: ../src/dialogs.py:2648
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2649
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2660
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2665 ../src/dialogs.py:2671
+#: ../src/groupchat_control.py:2260
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2666
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2672
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2677 ../src/gui_interface.py:2123
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2678 ../src/gui_interface.py:2124
 #, python-format
-msgid "%s is not the name of a group chat."
-msgstr "%s ne estas la nomo de babilejo."
+msgid ""
+"%s is already in your roster. Please check if %s is a correct group chat "
+"name. If it is, delete it from your roster and try joining the group chat "
+"again."
+msgstr ""
 
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2714
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2728
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2764
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2765
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2790
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2853
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2854
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7438,169 +8158,144 @@ msgstr ""
 "Plenigu la kaŝnomon aŭ la Jabber-ID de la kontakto,\n"
 "al kiu vi volas sendi mesaĝon:"
 
+#: ../src/dialogs.py:2856
+#, fuzzy
+msgid "Nickname / Jabber ID"
+msgstr "Ripeta Jabber-ID"
+
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2882 ../src/dialogs.py:3271 ../src/dialogs.py:3493
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
+#: ../src/dialogs.py:2883 ../src/dialogs.py:3272 ../src/dialogs.py:3494
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2892 ../src/dialogs.py:2895
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2895
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2904
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2928
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2929
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Kontakto ensalutis"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Kontakto elsalutis"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "Nova mesaĝo"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "Nova unuobla mesaĝo"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "Nova privata mesaĝo"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2974 ../src/gui_interface.py:898 ../src/notify.py:287
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2976 ../src/gui_interface.py:962 ../src/notify.py:280
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2978 ../src/gui_interface.py:860
+#: ../src/gui_interface.py:927 ../src/notify.py:282
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2980 ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1086 ../src/gui_interface.py:1107
+#: ../src/notify.py:284
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2981 ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1090 ../src/gui_interface.py:1111
+#: ../src/notify.py:285
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Babileja invitilo"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Kontakto ŝanĝis sian staton"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3190
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3192
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3194
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3197
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3220
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3243
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Mi estas %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3326
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3327
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3387
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3389
 msgid "XML Console"
 msgstr "XML-konzolo"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "add"
 msgstr "Malrapidas"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3523
 #, fuzzy
 msgid "remove"
 msgstr "_Forigi"
 
-#: ../src/dialogs.py:3204
+#: ../src/dialogs.py:3552
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7608,192 +8303,209 @@ msgid ""
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Aldoni"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3570 ../src/dialogs.py:3645
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3228
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Jabber-ID:"
-
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3582
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
-#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#. remote_jid = model[iter_][1]
+#: ../src/dialogs.py:3690
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3704
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "Aldoni _kontakton"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "Aldoni _kontakton"
+msgstr[1] "Aldoni _kontakton"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3742
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Forigas kontakton el kontaktlisto"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Forigas kontakton el kontaktlisto"
+msgstr[1] "Forigas kontakton el kontaktlisto"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3783 ../src/dialogs.py:3960 ../src/dialogs.py:4131
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3473
+#: ../src/dialogs.py:3823
 #, fuzzy
 msgid "Invalid expire value"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3824
 msgid "Expire must be a valid positive integer."
 msgstr ""
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3871
 msgid "There is an error with the form"
 msgstr ""
 
-#: ../src/dialogs.py:3732
+#: ../src/dialogs.py:4091
 msgid "There is an error"
 msgstr ""
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4165
+msgid "Success!"
+msgstr ""
+
+#: ../src/dialogs.py:4165
+#, fuzzy
+msgid "Your Archiving Preferences have been saved!"
+msgstr "_Agordo"
+
+#: ../src/dialogs.py:4181
+msgid "We got no response from the Server"
+msgstr ""
+
+#: ../src/dialogs.py:4183
+msgid "We received an error: {}"
+msgstr ""
+
+#: ../src/dialogs.py:4187
+#, fuzzy
+msgid "Error!"
+msgstr "Eraro de Avahi"
+
+#: ../src/dialogs.py:4246
+#, fuzzy
+msgid "Add Jabber ID"
+msgstr "Jabber-ID:"
+
+#: ../src/dialogs.py:4319
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4323
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4392
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4397
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4451
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4563
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4664
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4666
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4756
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4757
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4793
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4796
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4798
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4807
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4809
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4828
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4877
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4888 ../src/dialogs.py:4930 ../src/dialogs.py:4978
+#: ../src/dialogs.py:5067
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4893
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4919
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4935
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4965
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4983
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:5053
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:5072
 #, fuzzy
 msgid "Zip files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:5098
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:5100
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Kondiĉo"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "dum mi estas "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5322
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7801,38 +8513,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5325
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5331 ../src/dialogs.py:5416
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5337
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:5342
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5345 ../src/dialogs.py:5397 ../src/dialogs.py:5410
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5350
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5361
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:5362
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7842,77 +8554,129 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5363
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5398
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5404
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5411
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5417
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5483
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5485
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5487
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5491
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5596 ../src/dialogs.py:5632
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "por konto %s"
+
+#: ../src/dialogs.py:5596
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s\n"
+"\n"
+"SHA256 Fingerprint: %(sha256)s\n"
+msgstr ""
+
+#: ../src/dialogs.py:5643 ../src/gui_interface.py:1396
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "Aligado de speciala avizo por %s"
+
+#: ../src/dialogs.py:5644 ../src/dialogs.py:5661
+msgid "View cert..."
+msgstr ""
+
+#: ../src/disco.py:68
+msgid "This service has not yet responded with detailed information"
+msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
+
+#: ../src/disco.py:69
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"Tiu ĉi servo ne povis respondi per detala informo.\n"
+"Ĝi verŝajne estas malnova aŭ rompita"
+
+#: ../src/disco.py:128
 msgid "Others"
 msgstr "Aliaj"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:132
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:530
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:616
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:618
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:779
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:780
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7920,102 +8684,108 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:786 ../src/disco.py:1138
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:787
 msgid "This type of service does not contain any items to browse."
 msgstr "Tiu tipo de servo ne enhavas erojn por rigardi."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:828 ../src/disco.py:838
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:896
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:912
-msgid "_Browse"
+#: ../src/disco.py:943
+#, fuzzy
+msgid "Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1139
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1351
 #, fuzzy
-msgid "_Execute Command"
+msgid "Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1355 ../src/disco.py:1520
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1366
+#, fuzzy
+msgid "Join"
+msgstr "_Aliĝi"
+
+#: ../src/disco.py:1561
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1757
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1765
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1773
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1837 ../src/gui_interface.py:2629
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1838 ../src/gui_interface.py:2630
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1848 ../src/gui_interface.py:2644
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1849 ../src/gui_interface.py:2645
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2044
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2053
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2120
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2126
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2132
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
 #: ../src/features_window.py:49
-msgid "SSL certificat validation"
+msgid "SSL certificate validation"
 msgstr ""
 
 #: ../src/features_window.py:50
@@ -8024,7 +8794,7 @@ msgid ""
 msgstr ""
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr ""
 
 #: ../src/features_window.py:53
@@ -8040,7 +8810,9 @@ msgid "Requires python-avahi."
 msgstr ""
 
 #: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 msgstr ""
 
 #: ../src/features_window.py:57
@@ -8056,25 +8828,29 @@ msgstr ""
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py:60 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:96 ../src/features_window.py:100
+#: ../src/features_window.py:104
 msgid "Feature not available under Windows."
 msgstr ""
 
 #: ../src/features_window.py:61
 #, fuzzy
-msgid "OpenGPG message encryption"
+msgid "OpenPGP message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
 #: ../src/features_window.py:62
 #, fuzzy
-msgid "Encrypting chat messages with gpg keys."
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Ve_nanta mesaĝo:"
 
 #: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
+
+#: ../src/features_window.py:64
+msgid "Requires gpg.exe in PATH."
 msgstr ""
 
 #: ../src/features_window.py:65
@@ -8092,304 +8868,288 @@ msgstr ""
 
 #: ../src/features_window.py:69
 #, fuzzy
-msgid "Session Management"
-msgstr "Mesaĝo sendita"
-
-#: ../src/features_window.py:70
-msgid "Gajim session is stored on logout and restored on login."
-msgstr ""
-
-#: ../src/features_window.py:71
-msgid "Requires python-gnome2."
-msgstr ""
-
-#: ../src/features_window.py:73
-#, fuzzy
 msgid "Password encryption"
 msgstr "Pasvortoj diversas"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr ""
-
-#: ../src/features_window.py:77
-msgid "SRV"
-msgstr ""
-
-#: ../src/features_window.py:78
-msgid "Ability to connect to servers which are using SRV records."
-msgstr ""
-
-#: ../src/features_window.py:79
-msgid "Requires dnsutils."
-msgstr ""
-
-#: ../src/features_window.py:80
-msgid "Requires nslookup to use SRV records."
+#: ../src/features_window.py:71
+msgid ""
+"Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:73
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:74
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:75
 msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:76
+msgid "Requires libgtkspell and libenchant."
+msgstr ""
+
+#: ../src/features_window.py:77
 #, fuzzy
 msgid "Notification"
 msgstr "Konta korektado"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:78
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:79
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:81
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:82
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:83
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:84
 msgid "Requires python2.5."
 msgstr ""
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr ""
-
-#: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr ""
-
-#: ../src/features_window.py:95
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:96
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
-"You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-
-#: ../src/features_window.py:97
+#: ../src/features_window.py:85
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:86
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:87 ../src/features_window.py:88
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:89
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ĝenerala"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:91 ../src/features_window.py:92
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:94
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
+#: ../src/features_window.py:95
+msgid ""
+"Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
+"gstreamer1.0-plugins-ugly."
+msgstr ""
+
+#: ../src/features_window.py:97
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:98
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:99
+msgid "Requires python-gupnp-igd."
+msgstr ""
+
+#: ../src/features_window.py:101
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:103
+msgid "Requires upower and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 #, fuzzy
 msgid "?features:Available"
 msgstr "Enrete"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:118
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:85
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:100
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:112
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:243
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:450
 #, python-format
 msgid "Size: %s"
 msgstr "Longo: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:197 ../src/filetransfers_window.py:207
+#: ../src/history_manager.py:550
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:199 ../src/filetransfers_window.py:731
+#: ../src/tooltips.py:845
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:210
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "Dosiertransmeto plenumitas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "Dosiera transmeto nuligitas"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Konekto kun punkto neestableblas."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/filetransfers_window.py:238
-#, fuzzy
-msgid "File transfer stopped"
-msgstr "Dosiera transmeto haltitas"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:311
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:328 ../src/tooltips.py:880
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:341
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:342
 msgid "This file is being used by another process."
 msgstr "Tiu ĉi dosiero estas uzata de alia procezo."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "Dosiero: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Tipo: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Priskribo: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s volas sendi al vi dosieron:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:386 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:387 ../src/gtkgui_helpers.py:785
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:415 ../src/gtkgui_helpers.py:796
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:416 ../src/gtkgui_helpers.py:797
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:427
 msgid "Save File as..."
 msgstr "Konservi dosieron kiel..."
 
+#: ../src/filetransfers_window.py:447
+#, python-format
+msgid "File: %s"
+msgstr "Dosiero: %s"
+
+#: ../src/filetransfers_window.py:453
+#, python-format
+msgid "Type: %s"
+msgstr "Tipo: %s"
+
+#: ../src/filetransfers_window.py:455
+#, python-format
+msgid "Description: %s"
+msgstr "Priskribo: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s volas sendi al vi dosieron:"
+
+#: ../src/filetransfers_window.py:497
+#, fuzzy
+msgid "Checking file..."
+msgstr "Publicas vizitkarton..."
+
+#: ../src/filetransfers_window.py:511
+#, fuzzy
+msgid "File error"
+msgstr "Dosiertransmeta eraro"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:548
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8397,112 +9157,61 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:641
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:697 ../src/filetransfers_window.py:700
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:697
 msgid "File: "
 msgstr "Dosiero: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:701
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:727 ../src/tooltips.py:836
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:729 ../src/tooltips.py:839
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:896
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:142
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim bezonas X-servilon. Finas..."
-
-#: ../src/gajim.py:144
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr ""
-
-#: ../src/gajim.py:186
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
-
-#: ../src/gajim.py:187
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
-
-#: ../src/gajim.py:189
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
-
-#: ../src/gajim.py:190
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
-
-#: ../src/gajim.py:199
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim bezonas pywin32 por funkcii"
-
-#: ../src/gajim.py:200
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Bonvolu certiĝi ke Pywin32 estas instalita en via operaciuma sistemo. Vi "
-"povas preni ĝin ĉe %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
-msgid "Gajim is already running"
-msgstr "Gajim jam estas lanĉita"
-
-#: ../src/gajim.py:317
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
-"Ĉu lanĉu malgraŭ tio?"
+#: ../src/filetransfers_window.py:907
+msgid "_Continue"
+msgstr "_Daŭrigi"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../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-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8510,52 +9219,56 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172 ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:223 ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:239 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:257 ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:293
+#, fuzzy
+msgid "?CLI:account"
 msgstr "konto"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py: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-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:111
+#, fuzzy
+msgid "?CLI:status"
 msgstr "stato"
 
-#: ../src/gajim-remote-plugin.py:106
+#: ../src/gajim-remote.py:111
 #, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:284
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mesaĝo"
+
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../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"
@@ -8564,20 +9277,48 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:119
+#, fuzzy
+msgid "Changes the priority of account or accounts"
+msgstr "Ŝanĝas staton de konto aŭ kontoj"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tato:"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "priority you want to give to the account"
+msgstr "Mi volas registri novan konton"
+
+#: ../src/gajim-remote.py:123
+#, fuzzy
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"ŝanĝas staton de konto \"account\". Se ne estas specifita, provas ŝanĝi "
+"statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
+"komuna stato\""
+
+#: ../src/gajim-remote.py:129
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:131
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:223
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:136
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:141
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8587,34 +9328,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:154
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8624,133 +9360,130 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:168
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:170
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:177
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:183
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:185
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:189
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:202
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:215
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:229
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:232
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:237
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:244
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:251
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:255
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:257
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:263
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:264
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8758,46 +9491,100 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Kontakto ŝanĝis sian staton"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/gajim-remote.py:273
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
+"kontoj"
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:281
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "URI to handle"
+msgstr ""
+
+#: ../src/gajim-remote.py:282
+msgid "Account in which you want to handle it"
+msgstr ""
+
+#: ../src/gajim-remote.py:284
+#, fuzzy
+msgid "Message content"
+msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:288
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "Room JID"
+msgstr "Babilejo:"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "Nickname to use"
+msgstr "Kaŝnomo ne trovitas: %s"
+
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "Password to enter the room"
+msgstr "Pasvortoj diversas"
+
+#: ../src/gajim-remote.py:293
+msgid "Account from which you want to enter the room"
+msgstr ""
+
+#: ../src/gajim-remote.py:298
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:302
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:330
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:352
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8806,164 +9593,42 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:355
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:402
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:429
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Uzado: %s %s %s \n"
-"\t %s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:433
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:437
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:443
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Tro multe da argumentoj. \n"
-"Enigu \"%s help %s\" por plia informo"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Argumento \"%s\" ne estas specifita. \n"
-"Enigi \"%s help %s\" por plia informo"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Malprava uri"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr ""
-"unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
-
-#: ../src/gajim-remote.py:117
-#, fuzzy
-msgid "Changes the priority of account or accounts"
-msgstr "Ŝanĝas staton de konto aŭ kontoj"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority"
-msgstr "Priori_tato:"
-
-#: ../src/gajim-remote.py:119
-#, fuzzy
-msgid "priority you want to give to the account"
-msgstr "Mi volas registri novan konton"
-
-#: ../src/gajim-remote.py:121
-#, fuzzy
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"ŝanĝas staton de konto \"account\". Se ne estas specifita, provas ŝanĝi "
-"statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
-"komuna stato\""
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Kontakto ŝanĝis sian staton"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
-"kontoj"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr ""
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr ""
-
-#: ../src/gajim-remote.py:282
-#, fuzzy
-msgid "Message content"
-msgstr "mesaĝenhavo"
-
-#: ../src/gajim-remote.py:288
-#, fuzzy
-msgid "Room JID"
-msgstr "Babilejo:"
-
-#: ../src/gajim-remote.py:289
-#, fuzzy
-msgid "Nickname to use"
-msgstr "Kaŝnomo ne trovitas: %s"
-
-#: ../src/gajim-remote.py:290
-#, fuzzy
-msgid "Password to enter the room"
-msgstr "Pasvortoj diversas"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr ""
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:513
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8972,7 +9637,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:518
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8981,510 +9646,489 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:537
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim-remote.py:539
+msgid "Wrong uri"
+msgstr "Malprava uri"
+
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Etoso"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 #, fuzzy
 msgid "You cannot make changes to the default theme"
 msgstr "Vi ne povas forigi aktivan etoson"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "Etosa nomo"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "Vi ne povas forigi aktivan etoson"
 
-#: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#: ../src/gajim_themes_window.py:188
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:189 ../src/groupchat_control.py:1699
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s nomiĝas %s"
+
+#: ../src/groupchat_control.py:244
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:246
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:637
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:827
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:829
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
+#: ../src/groupchat_control.py:1311
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(nick)s estas elpelita: %(reason)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1329 ../src/groupchat_control.py:1641
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
+#: ../src/groupchat_control.py:1332
+msgid "Room now shows unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1334
+msgid "Room now does not show unavailable members"
+msgstr ""
+
+#: ../src/groupchat_control.py:1336
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1340
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1342
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:1344
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1347
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1350
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/groupchat_control.py:1634 ../src/groupchat_control.py:2303
+#: ../src/gui_interface.py:623 ../src/roster_window.py:3262
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1646
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1648
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1651
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1657
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1672
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1683 ../src/groupchat_control.py:1799
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s nomiĝas %s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1753 ../src/groupchat_control.py:1758
+#: ../src/groupchat_control.py:1764
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1755
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1760
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1766
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1849
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1868
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1872
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1902
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1907
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s nun estas %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2181
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2183
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "_Ne plu demandi"
-
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2222
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2223
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2235
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2236
 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:2261
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2267
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2268
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2270
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2452
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2453 ../src/groupchat_control.py:2734
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2733
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
 
-#: ../src/gtkexcepthook.py:46
-msgid "A programming error has been detected"
-msgstr "Programa eraro estas detektita"
-
-#: ../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:54
-msgid "_Report Bug"
-msgstr "_Raporti pri eraro"
-
-#: ../src/gtkexcepthook.py:76
-msgid "Details"
-msgstr "Detalaĵoj"
-
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Eraro: ne povas malfermi %s por legi"
-
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:392
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:395
 msgid "Error parsing file:"
 msgstr "Eraro dum dosieranalizo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:436
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Ne povas skribi en %s. Subteno de seancagordo ne funkcios"
 
-#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
-msgid "Gajim is not the default Jabber client"
-msgstr "Gajim ne estas defaŭlta jabber-kliento"
-
-#: ../src/gtkgui_helpers.py:823
-msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "Ĉu vi deziras fari Gajim la defaŭlta jabber-kliento?"
-
-#: ../src/gtkgui_helpers.py:824
-msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Ĉiam kontrolu ĉu Gajim estas defaŭlta jabber-kliento dum lanĉo"
-
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:770
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:771
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Bildo nekonserveblas en %(type)s formato. Ĉu konservu kiel %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:806
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:314 ../src/gui_interface.py:320
+#: ../src/gui_interface.py:323 ../src/gui_interface.py:326
+#: ../src/gui_interface.py:331
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
 #: ../src/gui_interface.py:138
 #, fuzzy, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
+"Your desired nickname in group chat\n"
+"<b>%s</b>\n"
+"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/gui_interface.py:141
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:159
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:161
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:164
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:207 ../src/notify.py:293
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:291
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:306
 #, python-format
-msgid "Maximum number of users for %s has been reached"
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr ""
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:315
 #, fuzzy, python-format
-msgid "You are banned from group chat %s."
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:321
 #, fuzzy, python-format
-msgid "Group chat %s does not exist."
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:324
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:327
 #, fuzzy, python-format
-msgid "Your registered nickname must be used in group chat %s."
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:332
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:426 ../src/gui_interface.py:430
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "eraro dum sendado %s ( %s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:482 ../src/notify.py:295
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:507
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:516
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:517
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 msgstr ""
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:539 ../src/notify.py:297
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:550
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:643
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
+msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
+#: ../src/gui_interface.py:647
+#, python-format
+msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:677
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:680 ../src/gui_interface.py:688
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:682
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:687
 #, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:700
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Pasfrazo necesas"
+
+#: ../src/gui_interface.py:701
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
+
+#: ../src/gui_interface.py:723
+msgid "OpenPGP key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:723
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 
-#: ../src/gui_interface.py:1031
-#, fuzzy
+#: ../src/gui_interface.py:769
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
+
+#: ../src/gui_interface.py:772
+msgid "Oauth2 Credentials"
 msgstr ""
-"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
-"(medivariablo eble ne korekte valorizitas)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:873
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vi havas %d novan retleteron"
 msgstr[1] "Vi havas %d novajn retleterojn"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:886
 #, python-format
 msgid ""
 "\n"
@@ -9494,103 +10138,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "Forigas kontakton el kontaktlisto"
+#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1424
+msgid "SSL certificate error"
+msgstr ""
 
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:1065
 #, fuzzy
-msgid "Error opening file"
-msgstr "Eraro dum legado de dosiero:"
+msgid "File Transfer Failed"
+msgstr "Dosieraj transmetoj"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1091
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1095
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
+
+#: ../src/gui_interface.py:1108
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1112
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
+#. ft hash error
+#: ../src/gui_interface.py:1116
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1199
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1211
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1212
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr ""
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1227
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1228
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
+#: ../src/gui_interface.py:1285
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1288
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1377
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1378
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9598,51 +10231,36 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1388
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1745
-msgid "SSL certificate error"
+#: ../src/gui_interface.py:1401
+msgid "Non Anonymous Server"
 msgstr ""
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1425
 #, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s has changed or your "
-"connection is being hacked.\n"
-"Old fingerprint: %(old)s\n"
-"New fingerprint: %(new)s\n"
+"It seems the SSL certificate of account %(account)s has changed and is not "
+"valid or your connection is being hacked.\n"
+"\n"
+"Old SHA-1 fingerprint: %(old_sha1)s\n"
+"Old SHA-256 fingerprint: %(old_sha256)s\n"
+"\n"
+"New SHA-1 fingerprint: %(new_sha1)s\n"
+"New SHA-256 fingerprint: %(new_sha256)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-#, fuzzy
-msgid "Insecure connection"
-msgstr "Konekto"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
-msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
-
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1503
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1545
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9650,109 +10268,139 @@ msgid ""
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:2070 ../src/gui_interface.py:2077
+#: ../src/gui_interface.py:2101
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:2071
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:2078 ../src/gui_interface.py:2102
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2150 ../src/roster_window.py:3832
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2506
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3105
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:3106
 #, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
-msgstr ""
+#: ../src/gui_interface.py:3120
+#, fuzzy
+msgid "OpenPGP key expired"
+msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/gui_interface.py:3427
+#: ../src/gui_interface.py:3121
 #, fuzzy, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3130
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gui_interface.py:3437
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3131
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:96
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:461
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
-#: ../src/history_manager.py:114
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:582
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transportiloj"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:588
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Montri Trans_portilojn"
+
+#: ../src/history_manager.py:76
+#, fuzzy
+msgid "Usage:"
+msgstr "mesaĝo"
+
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Options:"
+msgstr "Mienoj:"
+
+#: ../src/history_manager.py:80
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/history_manager.py:81
+#, fuzzy
+msgid "Set logs directory"
+msgstr "kreas dosierujon %s"
+
+#: ../src/history_manager.py:128
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Kontaktoj"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:181 ../src/history_manager.py:225
+#: ../src/history_window.py:102
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:188 ../src/history_manager.py:244
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:197 ../src/history_manager.py:232
+#: ../src/history_window.py:110
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:205 ../src/history_manager.py:238
 msgid "Subject"
 msgstr "Temo"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:264
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ĉu vi volas malplenigi la datumbazon? (EGE MALREKOMENDITA SE GAJIM AKTIVAS)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:266
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9766,96 +10414,109 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:271
+msgid "Database Cleanup"
+msgstr ""
+
+#: ../src/history_manager.py:486
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:562
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: ../src/history_manager.py:572
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
-msgstr[1] "Ĉu vi vere volas forigi protokolojn de la elektitaj kontaktoj?"
+#: ../src/history_manager.py:600
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
+
+#: ../src/history_manager.py:604
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606 ../src/history_manager.py:645
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Kontakta informo"
+
+#: ../src/history_manager.py:642
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:319
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:369
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:468
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:479
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:481
 msgid "Error"
 msgstr ""
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:483
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:486
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:559
 #, fuzzy
-msgid "Timeout loading image"
-msgstr "Ne povas alŝuti bildon"
+msgid "Loading"
+msgstr "Tajpas mesaĝon"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:238
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:239
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:529
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:531
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:533
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:539
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -9867,153 +10528,165 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s ŝanĝis staton"
+#: ../src/notify.py:335
+#, fuzzy
+msgid "Ignore"
+msgstr "naŭ"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s ensalutis"
+#: ../src/plugins/gui.py:81
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s elsalutis"
+#: ../src/plugins/gui.py:150
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Malpermesas %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "Nova unuopa mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:207
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Konektado malsukcesis"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "Nova privata mesaĝo de babilejo %s"
+#: ../src/plugins/gui.py:252
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s: %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:566
+#: ../src/plugins/pluginmanager.py:574
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:273
-#, fuzzy, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Nova mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/pluginmanager.py:582
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "Nova mesaĝo de %(nickname)s"
+#: ../src/plugins/gui.py:284
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
+#: ../src/plugins/gui.py:316
 #, fuzzy
-msgid "Ignore"
-msgstr "naŭ"
+msgid "Configuration"
+msgstr "Agordo de babilejo"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:552 ../src/plugins/pluginmanager.py:558
+msgid "Archive corrupted"
+msgstr ""
 
-#: ../src/profile_window.py:58
+#: ../src/plugins/pluginmanager.py:554
+#, fuzzy
+msgid "Archive empty"
+msgstr "Dosierindiko"
+
+#: ../src/profile_window.py:63
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:132 ../src/roster_window.py:3131
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:135 ../src/roster_window.py:3134
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:149 ../src/profile_window.py:166
+#: ../src/roster_window.py:3136 ../src/roster_window.py:3147
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:239
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakta informo"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:240
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: JJJJ-MM-TT"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:298
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:376
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:389
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:408
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:415
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:416
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:258 ../src/roster_window.py:1059
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2070
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2071
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2094
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2095
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2109
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2110
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
-msgstr ""
+#: ../src/roster_window.py:2137
+#, fuzzy
+msgid "OpenPGP is not usable"
+msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2138
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2345 ../src/roster_window.py:3762
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2346 ../src/roster_window.py:3763
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10021,55 +10694,55 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2373
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2438
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2439
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2440
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2527
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nuligi dosiertransmeton"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2528
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2559 ../src/roster_window.py:2917
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2560
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2918
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2921
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2922
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10077,11 +10750,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2925
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2930
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10090,69 +10763,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2981
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2983
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr ""
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3023
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3024
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3031
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3032
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3077
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3078
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3079
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3118
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3119
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3573
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3575
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3580
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10161,12 +10834,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3586
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3590
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10174,16 +10847,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3593
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3597
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3602
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10192,46 +10865,46 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py:3660
 #, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3662
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3681
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3682
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4391
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4393
 #, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4489
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4491
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -10241,206 +10914,155 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4613
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4625
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4764
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4777
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Igi %s kaj %s metakontaktoj"
+
+#: ../src/roster_window.py:4782
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../src/roster_window.py:5246 ../src/roster_window.py:5301
+#: ../src/roster_window.py:5311 ../src/statusicon.py:270
+#: ../src/statusicon.py:318 ../src/statusicon.py:325
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
-#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5320
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
-#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5327
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5366 ../src/statusicon.py:335
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
-#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5384
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5426
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5480 ../src/roster_window.py:5581
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5510
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5512
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5516
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5657
 msgid "_Maximize All"
 msgstr ""
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5664 ../src/roster_window.py:5826
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5671
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5675
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5842
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
-#. Edit Groups
-#: ../src/roster_window.py:5537
-msgid "Edit _Groups"
-msgstr "Aranĝi _Grupojn"
-
-#. Send single message
-#: ../src/roster_window.py:5592
-#, fuzzy
-msgid "Send Single Message"
-msgstr "_Sendi unuopan mesaĝon"
-
-#. Execute Command
-#: ../src/roster_window.py:5639
-msgid "Execute Command..."
-msgstr "Plenumi komandon..."
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:5649
-#, fuzzy
-msgid "_Manage Transport"
-msgstr "Transportiloj"
-
-#. Modify Transport
-#: ../src/roster_window.py:5658
-#, fuzzy
-msgid "_Modify Transport"
-msgstr "Montri Trans_portilojn"
-
-#. Rename
-#: ../src/roster_window.py:5668
-msgid "_Rename"
-msgstr "_Renomigi"
-
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5744
-#, fuzzy
-msgid "_Disconnect"
-msgstr "Kontakto malkonektita"
-
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6004
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6012
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6299
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:108
 msgid "Waiting for results"
 msgstr ""
 
-#: ../src/search_window.py:143 ../src/search_window.py:220
+#: ../src/search_window.py:146 ../src/search_window.py:224
 msgid "Error in received dataform"
 msgstr ""
 
 #. No result
-#: ../src/search_window.py:177 ../src/search_window.py:212
+#: ../src/search_window.py:181 ../src/search_window.py:216
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr ""
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Temo: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:429 ../src/session.py:489
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:448
+#: ../src/session.py:431
 #, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
 "Are these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:492
+#: ../src/session.py:491
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10450,184 +11072,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:494
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
+
+#: ../src/statusicon.py:235
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:348
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:360
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
-msgid "Jabber ID: "
-msgstr "Jabber-ID: "
-
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
-msgid "Resource: "
-msgstr "Risurco: "
-
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:376
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:565
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:569
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
-msgid "Status: "
-msgstr "Stato: "
-
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:768
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:770
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:787
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:789
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
-msgid "Subscription: "
-msgstr "Abono: "
-
-#: ../src/tooltips.py:625
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:646
-#, fuzzy, python-format
-msgid "Idle since %s"
-msgstr " ekde %s"
-
-#: ../src/tooltips.py:647
-#, fuzzy, python-format
-msgid "Idle for %s"
-msgstr "XML-konzolo por %s"
-
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
-msgstr "Babilejo:"
-
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
-msgstr "Ŝaltita"
-
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
-msgstr "Tipo:"
-
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
-msgstr "Konta korektado"
-
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:838
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:844
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:851
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:857
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:860 ../src/tooltips.py:877
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:862
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:864 ../src/tooltips.py:867
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:870
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:873
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:875
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:812
-msgid "This service has not yet responded with detailed information"
-msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
-
-#: ../src/tooltips.py:815
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
-msgstr ""
-"Tiu ĉi servo ne povis respondi per detala informo.\n"
-"Ĝi verŝajne estas malnova aŭ rompita"
+#: ../src/tooltips.py:878
+msgid "Status: "
+msgstr "Stato: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:328 ../src/vcard.py:335
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:332 ../src/vcard.py:337
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:366 ../src/vcard.py:369
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:397 ../src/vcard.py:406 ../src/vcard.py:614
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:429
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:433
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:441
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10635,36 +11203,562 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:443
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:445
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:447
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Nek vi nek kontakto ne interesiĝas unu pri ĉeesto de alia"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:454
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:456
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:461 ../src/vcard.py:515 ../src/vcard.py:637
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
+#, fuzzy
+#~ msgid "Error description..."
+#~ msgstr "Priskribo"
+
+#, fuzzy
+#~ msgid "View contact information (Ctrl+I)"
+#~ msgstr "atentas al la komunikado"
+
+#, fuzzy
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "<b>Priskribo</b>"
+
+#, fuzzy
+#~ msgid "Enter JID or Contact name"
+#~ msgstr "Kontaktnomo"
+
+#, fuzzy
+#~ msgid "Groupchat Histories"
+#~ msgstr "Babilejoj"
+
+#, fuzzy
+#~ msgid "All Chat Histories"
+#~ msgstr "ia ajn stato"
+
+#~ msgid "More"
+#~ msgstr "Plu"
+
+#~ msgid "A connection is not available"
+#~ msgstr "Konekto mankas"
+
+#~ msgid "Your message can not be sent until you are connected."
+#~ msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
+
+#~ msgid "creating %s directory"
+#~ msgstr "kreas dosierujon %s"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid ""
+#~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+#~ "account passwords."
+#~ msgstr ""
+#~ "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
+#~ "pasvortojn."
+
+#, fuzzy
+#~ msgid "Please check if avahi/bonjour-daemon is running."
+#~ msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
+
+#~ msgid "%s is not the name of a group chat."
+#~ msgstr "%s ne estas la nomo de babilejo."
+
+#, fuzzy
+#~ msgid "Session Management"
+#~ msgstr "Mesaĝo sendita"
+
+#~ msgid "Gajim needs X server to run. Quiting..."
+#~ msgstr "Gajim bezonas X-servilon. Finas..."
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above"
+#~ msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above"
+#~ msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
+
+#~ msgid "Gajim needs pywin32 to run"
+#~ msgstr "Gajim bezonas pywin32 por funkcii"
+
+#~ msgid ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+#~ msgstr ""
+#~ "Bonvolu certiĝi ke Pywin32 estas instalita en via operaciuma sistemo. Vi "
+#~ "povas preni ĝin ĉe %s"
+
+#~ msgid "Gajim is already running"
+#~ msgstr "Gajim jam estas lanĉita"
+
+#~ msgid ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+#~ msgstr ""
+#~ "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
+#~ "Ĉu lanĉu malgraŭ tio?"
+
+#~ msgid "A programming error has been detected"
+#~ msgstr "Programa eraro estas detektita"
+
+#~ 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."
+
+#~ msgid "_Report Bug"
+#~ msgstr "_Raporti pri eraro"
+
+#~ msgid "Details"
+#~ msgstr "Detalaĵoj"
+
+#, fuzzy
+#~ 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)"
+
+#~ msgid "Jabber ID: "
+#~ msgstr "Jabber-ID: "
+
+#~ msgid "Resource: "
+#~ msgstr "Risurco: "
+
+#~ msgid "Subscription: "
+#~ msgstr "Abono: "
+
+#, fuzzy
+#~ msgid "Mood: "
+#~ msgstr "Babilejo:"
+
+#, fuzzy
+#~ msgid "Activity: "
+#~ msgstr "Ŝaltita"
+
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Eniri en babilejon"
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Korekti konton"
+
+#, fuzzy
+#~ msgid "Check on startup if Gajim is the _default Jabber client"
+#~ msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Babilejo"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Sendi unuopan _mesaĝon"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Certificate"
+#~ msgstr "Malkorekta salutnomo"
+
+#~ msgid "Gajim is not the default Jabber client"
+#~ msgstr "Gajim ne estas defaŭlta jabber-kliento"
+
+#~ msgid "Would you like to make Gajim the default Jabber client?"
+#~ msgstr "Ĉu vi deziras fari Gajim la defaŭlta jabber-kliento?"
+
+#~ 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"
+
+#~ msgid "Edit _Groups"
+#~ msgstr "Aranĝi _Grupojn"
+
+#, fuzzy
+#~ msgid "Send Single Message"
+#~ msgstr "_Sendi unuopan mesaĝon"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Plenumi komandon..."
+
+#~ msgid "_Rename"
+#~ msgstr "_Renomigi"
+
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Elektu dosieron por sendi..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " iun fenestron/slipon malfermitan kun tiu kontakto "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Agoj</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Kondiĉoj</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Kromaj agoj"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Kroma agordo de avizado"
+
+#~ msgid "All statuses"
+#~ msgstr "ia ajn stato"
+
+#~ msgid "Busy "
+#~ msgstr "Okupata "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Kontakto ŝanĝis sian staton"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Kontakto malkonektita"
+
+#~ msgid "Don't have "
+#~ msgstr "Ne havas "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "Dosiera transmeto haltitas"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Emfazado de mesaĝoj en babilejo"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Ricevitas mesaĝo en babilejo"
+
+#~ msgid "Launch a command"
+#~ msgstr "Lanĉi komandon"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "kelka(j) speciala(j) stato(j)..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Enrete / Babilema"
+
+#~ msgid "Play a sound"
+#~ msgstr "Ludi sonon"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "Nova privata mesaĝo"
+
+#~ msgid "When "
+#~ msgstr "Kiam "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
+#~ "interparolan fenestron en taskostrio"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Malŝaltas aŭtomatan malfermadon de interparola fenestro"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Malŝalti ekzistan ŝprucfenestron"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Malŝalti ekzistan sonon por tiu ĉi evento"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Malŝalti eventmontron en kontaktlisto"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Malŝalti eventmontron en kontaktlisto"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Informi min per ŝprucfenestro"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "Malfermi interparolan _fenestron por uzulo"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "Montri eventon en _kontaktlisto"
+
+#~ msgid "and I "
+#~ msgstr "kaj mi "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Kontaktoj"
+
+#~ msgid "for "
+#~ msgstr "por "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Grupo"
+
+#~ msgid "when I'm in"
+#~ msgstr "dum mi estas je"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Permesi al li/ŝi vidi vian staton"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Priskribo: %s"
+
+#, fuzzy
+#~ msgid "Advanced..."
+#~ msgstr "Krome"
+
+#, fuzzy
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
+#~ "fenestro kaj en babilejoj"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Sendi unuopan _mesaĝon..."
+
+#, fuzzy
+#~ msgid "User avatar:"
+#~ msgstr "Kaŝbildeto:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim tujmesaĝilo"
+
+#~ msgid "English"
+#~ msgstr "Angla"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belorusa"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgara"
+
+#~ msgid "Breton"
+#~ msgstr "Bretona"
+
+#~ msgid "Czech"
+#~ msgstr "Ĉeĥa"
+
+#~ msgid "German"
+#~ msgstr "Germana"
+
+#~ msgid "Greek"
+#~ msgstr "Greka"
+
+#~ msgid "British"
+#~ msgstr "Brita"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Hispana"
+
+#~ msgid "Basque"
+#~ msgstr "Eŭska"
+
+#~ msgid "French"
+#~ msgstr "Franca"
+
+#~ msgid "Croatian"
+#~ msgstr "Kroata"
+
+#~ msgid "Italian"
+#~ msgstr "Itala"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norvega (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Nederlanda"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvega"
+
+#~ msgid "Polish"
+#~ msgstr "Pola"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portugala"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazila Portugala"
+
+#~ msgid "Russian"
+#~ msgstr "Rusa"
+
+#, fuzzy
+#~ msgid "Serbian"
+#~ msgstr "Germana"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovaka"
+
+#~ msgid "Swedish"
+#~ msgstr "Sveda"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Ĉina (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Lingvo de literumado"
+
+#~ msgid "all or space separated status"
+#~ msgstr "'all' aŭ spacetseparitaj statoj"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', aŭ 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' aŭ ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Kontrolu vian konekton aŭ provu denove poste"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "eraro: %s nedisponeblas por legi"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Neeblas aliĝi al pordo %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Eble vi havas alian ekzempleron kiu estas plenumata nun. Dosiertransmeto "
+#~ "estos nuligita."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "GTK+ jabber-kliento"
+
+#~ msgid "Condition"
+#~ msgstr "Kondiĉo"
+
+#~ msgid "when I am "
+#~ msgstr "dum mi estas "
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr ""
+#~ "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, "
+#~ "nevidebla "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Uzado: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Tro multe da argumentoj. \n"
+#~ "Enigu \"%s help %s\" por plia informo"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argumento \"%s\" ne estas specifita. \n"
+#~ "Enigi \"%s help %s\" por plia informo"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontaktoj"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Temo: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Babilejo:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Ŝaltita"
+
 #~ msgid "_Disable showing event in systray"
 #~ msgstr "_Malŝalti montron de evento en taskopleto"
 
@@ -10682,30 +11776,12 @@ msgstr " risurco kun prioritato "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Kaŝnomo malpermesita: %s"
 
-#, fuzzy
-#~ msgid "Room has been destroyed"
-#~ msgstr "Permeso estas forigita"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "Mi volus aldoni vin al mia kontaktlisto."
-
 #~ msgid "we are now subscribed to %s"
 #~ msgstr "nun ni abonas %s"
 
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "ordono pri abona fino de %s"
-
 #~ msgid "we are now unsubscribed from %s"
 #~ msgstr "ni nun ne abonas pri %s"
 
-#~ msgid ""
-#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
-#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
-#~ msgstr ""
-#~ "JID %s ne estas norma laŭ la RFC. Ĝi ne aldonitos al via kontaktlisto. "
-#~ "Uzu kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por "
-#~ "forigi ĝin"
-
 #~ msgid "Account Modification"
 #~ msgstr "Konta korektado"
 
@@ -10789,9 +11865,6 @@ msgstr " risurco kun prioritato "
 #~ "Kontakta linio\n"
 #~ "Rubando"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Administri kontojn"
-
 #, fuzzy
 #~ msgid "gtk-delete"
 #~ msgstr "Forigi"
@@ -10896,9 +11969,6 @@ msgstr " risurco kun prioritato "
 #~ msgstr ""
 #~ "Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
 
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
-
 #~ msgid "%i days ago"
 #~ msgstr "Antaŭ %i tagoj"
 
@@ -10911,12 +11981,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Commands: %s"
 #~ msgstr "Komandoj: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
 #, fuzzy
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -10925,10 +11989,6 @@ msgstr " risurco kun prioritato "
 #~ "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s "
 #~ "eksplodas)."
 
-#, fuzzy
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
-
 #~ msgid "No help info for /%s"
 #~ msgstr "helpinformo mankas por /%s"
 
@@ -10945,10 +12005,6 @@ msgstr " risurco kun prioritato "
 #~ msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
 #, fuzzy
-#~ msgid "Nickname not found"
-#~ msgstr "Kaŝnomo ne trovitas: %s"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 #~ "nickname of an occupant may be substituted, but not if it contains \"@\". "
@@ -10959,13 +12015,6 @@ msgstr " risurco kun prioritato "
 #~ "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
-#~ "specifita persono."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -11005,9 +12054,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -11040,10 +12086,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Host:"
 #~ msgstr "_Retnodo:"
 
-#, fuzzy
-#~ msgid "Show _roster"
-#~ msgstr "Montri _kontaktliston"
-
 #~ msgid "Modify Account"
 #~ msgstr "Korekti konton"
 
@@ -11056,9 +12098,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim-konto %s"
 
-#~ msgid "Duplicate Jabber ID"
-#~ msgstr "Ripeta Jabber-ID"
-
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
@@ -11128,9 +12167,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "Ebligi _lig-lokan komunikadon"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Klaku por vidi pasintajn interparolojn kun tiu ĉi kontakto"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Kompakta vido    Alt+C"
 
@@ -11143,9 +12179,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Query Builder..."
 #~ msgstr "Konstruilo de petoj..."
 
-#~ msgid "Accept"
-#~ msgstr "Akcepti"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invito estas ricevita"
 
@@ -11241,9 +12274,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "The auto away status message"
 #~ msgstr "La aŭtomate fora statmesaĝo"
 
-#~ msgid "The auto not available status message"
-#~ msgstr "La aŭtomate nedisponebla statmesaĝo"
-
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Rigardi ĉiujn venantajn mesaĝojn kiel:"
 
@@ -11319,9 +12349,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "OS:"
 #~ msgstr "OS:"
 
-#~ msgid "Subscription:"
-#~ msgstr "Abono:"
-
 #~ 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 "
@@ -11542,6 +12569,3 @@ msgstr " risurco kun prioritato "
 
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Aŭtomate permesi kontakton"
-
-#~ msgid "Send File"
-#~ msgstr "Sendi dosieron"