update po files

1 files changed, 5286 insertions, 4123 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 2e651a0b8..0ea51854c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,15 +3,11 @@
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 #
 # Jeff Bailes <thepizzaking@gmail.com>, 2006, 2009.
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
+"POT-Creation-Date: 2017-01-10 03:06+0000\n"
 "PO-Revision-Date: 2009-11-20 20:49+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -21,306 +17,299 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
-msgid "Join _Group Chat..."
-msgstr "Join _Group Chat..."
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "_Status"
 
 #: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "_Personal Events"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
+msgid "_Start Chat..."
+msgstr "_Start Chat..."
+
+#: ../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 "Join _Group Chat"
+
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "_Add Contact..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "_Discover Services"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "_Execute Command..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "_Modify Account"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "_Open Gmail Inbox"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "_Personal Events"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "_Start Chat..."
-
 #: ../data/gui/account_context_menu.ui.h:9
 #: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "_Status"
+msgid "_Modify Account..."
+msgstr "_Modify Account..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+#: ../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 "None"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Account Creation Wizard"
+
+#: ../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>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I already have an account I want to _use"
+msgstr "I already have an account I want to _use"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
+msgid "I want to _register for a new account"
+msgstr "I want to _register for a new account"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Please choose one of the options below:</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Please fill in the data for your existing account</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>Please select a server</b>"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymous authentication"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "Connect when I press Finish"
+#: ../data/gui/accounts_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Password:"
+msgstr "_Password:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Account Creation Wizard"
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Save pass_word"
+msgstr "Save pass_word"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "I already have an account I want to _use"
+#: ../data/gui/accounts_window.ui.h:17
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "If ticked, Gajim will remember the password for this account"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "I want to _register for a new account"
+msgid "<b>Please select a server</b>"
+msgstr "<b>Please select a server</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "If ticked, Gajim will remember the password for this account"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-msgid "Manage..."
-msgstr "Manage..."
+msgid "Prox_y:"
+msgstr "Prox_y:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
-msgid "None"
-msgstr "None"
+msgid "Manage..."
+msgstr "Manage..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "Prox_y:"
+msgid "Use custom hostname/port"
+msgstr "Use custom hostname/port"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "Save pass_word"
+msgid "_Hostname:"
+msgstr "_Hostname:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "Set my profile when I connect"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "Use custom hostname/port"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "_Advanced"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
-
-#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "_Advanced"
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "_Finish"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "_Hostname:"
-
-#: ../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>Connecting to server</b>\n"
+"\n"
+"Please wait..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "_Password:"
+msgid "Connect when I press Finish"
+msgstr "Connect when I press Finish"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+msgid "Set my profile when I connect"
+msgstr "Set my profile when I connect"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscellaneous</b>"
+msgid "_Finish"
+msgstr "_Finish"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "Accounts"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>Personal Information</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3568
+#: ../src/dialogs.py:3614
+msgid "Add"
+msgstr "Add"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3572
+#: ../src/dialogs.py:3669
+msgid "Delete"
+msgstr "Delete"
 
 #: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "A_djust to status"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "Account"
-
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "Accounts"
+msgid "Re_name"
+msgstr "Re_name"
 
-#: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "Administration operations"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4210
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "Active"
 
 #: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymous authentication"
+msgid "Resour_ce:"
+msgstr "Resour_ce:"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "Auto-reconnect when connection is lost"
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
-msgid "Browse..."
-msgstr "_Browse"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
 
-#: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "C_onnect on Gajim startup"
+#. 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 "Chan_ge Password"
+msgid "A_djust to status"
+msgstr "A_djust to status"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
+msgid "Priority will change automatically according to your status."
+msgstr "Priority will change automatically according to your status."
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "Choose File to Send..."
-
-#: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "Choose _Key..."
-
-#: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "Click to change account's password"
+msgid "Anonymous authentication"
+msgstr "Anonymous authentication"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "Click to request authorisation to all contacts of another account"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
 
 #: ../data/gui/accounts_window.ui.h:19
 #, fuzzy
-msgid "Client certificate"
-msgstr "Self signed certificate"
+msgid "Synchronize contacts"
+msgstr "Synchronise contacts"
 
 #: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nnect on Gajim startup"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Click to request authorisation to all contacts of another account"
 
 #: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "Connection"
+msgid "Chan_ge Password"
+msgstr "Chan_ge Password"
 
 #: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
+msgid "Click to change account's password"
+msgstr "Click to change account's password"
 
 #: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "First Name:"
+msgid "Administration operations"
+msgstr "Administration operations"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr ""
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
-msgid "General"
-msgstr "General"
+#: ../data/gui/accounts_window.ui.h:25
+#, fuzzy
+msgid "Browse..."
+msgstr "_Browse"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"If ticked, Gajim will also broadcast some more IPs except from just your IP, "
-"so file transfer has higher chances of working."
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "Certificate rejected"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
+#, fuzzy
+msgid "Client certificate"
+msgstr "Self signed certificate"
+
+#: ../data/gui/accounts_window.ui.h:28 ../data/gui/join_groupchat_window.ui.h:2
+msgid "Account"
+msgstr "Account"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr ""
-"If ticked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
+msgid "C_onnect on Gajim startup"
+msgstr "C_onnect on Gajim startup"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -331,6 +320,23 @@ msgstr ""
 "this account"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "Auto-reconnect when connection is lost"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "Save conversation _logs for all contacts"
+
+#: ../data/gui/accounts_window.ui.h:33
+#, fuzzy
+msgid "Synchronize logs with server"
+msgstr "Synchronise contacts"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronise account status with global status"
+
+#: ../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 "
@@ -340,180 +346,225 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "Information about you, as stored in the server"
-
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:831
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "Surname:"
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "Mer_ge accounts"
+msgid "Use file transfer proxies"
+msgstr "Use file transfer proxies"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "No key selected"
+#: ../data/gui/accounts_window.ui.h:38
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"If ticked, Gajim will also broadcast some more IPs except from just your IP, "
+"so file transfer has higher chances of working."
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "Personal Information"
+#. 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 "General"
 
-#: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "_use HTTP__PROXY environment variable"
+msgstr "_use HTTP__PROXY environment variable"
+
+#: ../data/gui/accounts_window.ui.h:41 ../data/gui/preferences_window.ui.h:140
+msgid "_Manage..."
+msgstr "_Manage..."
 
 #: ../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 ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxy</b>"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "Priority will change automatically according to your status."
+msgid "_Warn before using an insecure connection"
+msgstr "_Warn before using an insecure connection"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
-msgid "Re_name"
-msgstr "Re_name"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "Resour_ce:"
+msgid "Send _keep-alive packets"
+msgstr "Send _keep-alive packets"
 
 #: ../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 ""
-"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 ticked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "Save conversation _logs for all contacts"
+msgid "Use cust_om hostname/port"
+msgstr "Use cust_om hostname/port"
+
+#: ../data/gui/accounts_window.ui.h:48
+msgid "_Hostname: "
+msgstr "_Hostname: "
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "Send _keep-alive packets"
+msgid "_Port: "
+msgstr "_Port: "
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "Synch_ronise account status with global status"
+#: ../data/gui/accounts_window.ui.h:50 ../data/gui/preferences_window.ui.h:143
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Miscellaneous</b>"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "Synchroni_se account status with global status"
+msgid "Connection"
+msgstr "Connection"
 
-#: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronise contacts"
+#: ../data/gui/accounts_window.ui.h:52 ../src/config.py:1853
+#: ../src/config.py:2467
+msgid "No key selected"
+msgstr "No key selected"
 
 #: ../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 "Choose _Key..."
 
 #: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
 msgstr "Use G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "Use cust_om hostname/port"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "Use cust_om port:"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "Use file transfer proxies"
+msgid "_Edit Personal Information..."
+msgstr "_Edit Personal Information..."
 
 #: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr ""
+msgid "Information about you, as stored in the server"
+msgstr "Information about you, as stored in the server"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "_Edit Personal Information..."
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personal Information</b>"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "_Enable"
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "Personal Information"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "_Hostname: "
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nnect on Gajim startup"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid "Synchroni_ze account status with global status"
+msgstr "Synchroni_se account status with global status"
 
 #: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "_Manage..."
+msgid "Use cust_om port:"
+msgstr "Use cust_om port:"
 
-#: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "_Port: "
+#: ../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 ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "_Warn before using an insecure connection"
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "First Name:"
+msgstr "First Name:"
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "_use HTTP__PROXY environment variable"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Last Name:"
+msgstr "Surname:"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "A_ccount:"
+#: ../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 "A_llow this contact to view my status"
+#: ../data/gui/accounts_window.ui.h:69
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "Add New Contact"
+#: ../data/gui/accounts_window.ui.h:70
+msgid "Mer_ge accounts"
+msgstr "Mer_ge accounts"
 
-#: ../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 "I would like to add you to my contact list."
 
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "Add New Contact"
+msgstr "Add New Contact"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "A_ccount:"
+msgstr "A_ccount:"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_Protocol:"
+msgstr "_Protocol:"
+
 #: ../data/gui/add_new_contact_window.ui.h:5
+msgid "_User ID:"
+msgstr "_User ID:"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Nickname:"
+msgstr "_Nickname:"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "_Group:"
+msgstr "_Group:"
+
+#: ../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 "A_llow this contact to view my status"
+
+#: ../data/gui/add_new_contact_window.ui.h:10
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Subscription"
+
+#: ../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 ""
 "You have to register with this transport\n"
@@ -521,7 +572,11 @@ msgstr ""
 "protocol. Click on register button to\n"
 "proceed."
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:15
+msgid "_Register"
+msgstr "_Register"
+
+#: ../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."
@@ -529,702 +584,583 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "_Group:"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "_Nickname:"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "_Protocol:"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "_Register"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
-msgid "_Save subscription message"
-msgstr "_Subscription"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "_User ID:"
-
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>An error has occurred:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Choose command to execute:</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "Please wait while retrieving command list..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Commands - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Choose command to execute:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Check once more"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "Error description..."
-
-#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
-msgid "F_inish"
-msgstr "_Finish"
-
-#: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "Please wait while retrieving command list..."
-
-#: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
+msgid "Please wait while the command is being sent..."
 msgstr "Please wait while the command is sending..."
 
-#: ../data/gui/adhoc_commands_window.ui.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait..."
 msgstr "Please wait..."
 
-#: ../data/gui/adhoc_commands_window.ui.h:10
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "This jabber entity does not expose any commands."
 msgstr "This jabber entity does not expose any commands."
 
-#: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>Description</b>"
+#: ../data/gui/adhoc_commands_window.ui.h:8
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>An error has occurred:</b>"
 
-#: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+#: ../data/gui/adhoc_commands_window.ui.h:9
+#, fuzzy
+msgid "F_inish"
+msgstr "_Finish"
 
-#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:1
 msgid "Advanced Configuration Editor"
 msgstr "Advanced Configuration Editor"
 
-#: ../data/gui/advanced_configuration_window.ui.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "Filter:"
 msgstr "Filter:"
 
+#: ../data/gui/advanced_configuration_window.ui.h:3
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>Description</b>"
+
+#: ../data/gui/advanced_configuration_window.ui.h:4
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "_Reset to Default Colours"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "Delete MOTD"
+msgid "Show _XML Console"
+msgstr "Show _XML Console"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "Deletes Message of the Day"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Edit Archi_ving Preferences"
 msgstr "_Preferences"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "Edit _Privacy Lists..."
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "_Administrator"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sends a message to users currently connected to this server"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "Set MOTD..."
+msgid "_Send Server Message..."
+msgstr "_Send Server Message..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "Sets Message of the Day"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "Show _XML Console"
+msgid "Set MOTD..."
+msgstr "Set MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "Update MOTD..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "Updates Message of the Day"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "Update MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "_Administrator"
+msgid "Deletes Message of the Day"
+msgstr "Deletes Message of the Day"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "_Send Server Message..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr " a window/tab opened with that contact "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>Actions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>Conditions</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>Sounds</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "Advanced Actions"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "Advanced Notifications Control"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "All statuses"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "Away"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "Busy "
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "Contact Changed Status"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "Contact Disconnected"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "Don't have "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "File Transfers"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "File Transfer Request"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "File Transfer Stopped"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "Group Chat Message Highlight"
+msgid "Delete MOTD"
+msgstr "Delete MOTD"
 
-#: ../data/gui/advanced_notifications_window.ui.h:17
+#: ../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 "Group Chat Message Received "
-msgstr "Group Chat Message Received"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "Have "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "Launch a command"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "Not Available"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "One or more special statuses..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "Online / Free For Chat"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "Play a sound"
+msgid "Always"
+msgstr "Away"
 
-#: ../data/gui/advanced_notifications_window.ui.h:25
+#: ../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 "Receive a Message"
-msgstr "New Private Message"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "When "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "_Disable auto opening chat window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "_Disable existing pop-up window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "_Disable existing sound for this event"
+msgid "Never"
+msgstr "_Never"
 
-#: ../data/gui/advanced_notifications_window.ui.h:31
+#: ../data/gui/archiving_313_preferences_item.ui.h:4
 #, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "_Disable showing event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "_Disable showing event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "_Inform me with a pop-up window"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "_Open chat window with user"
+msgid "Preference:"
+msgstr "Preferences"
 
-#: ../data/gui/advanced_notifications_window.ui.h:35
+#: ../data/gui/archiving_313_preferences_window.ui.h:2
 #, fuzzy
-msgid "_Show event in notification area"
-msgstr "_Show event in roster"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "_Show event in roster"
+msgid "Roster"
+msgstr "Show _Roster"
 
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "and I "
+#. holds jid
+#: ../data/gui/archiving_313_preferences_window.ui.h:4 ../src/dialogs.py:3576
+#: ../src/history_manager.py:168
+msgid "Jabber ID"
+msgstr "Jabber ID"
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
+#: ../data/gui/archiving_313_preferences_window.ui.h:5
 #, fuzzy
-msgid "contact(s)"
-msgstr "Contacts"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "for "
+msgid "Preference"
+msgstr "Preferences"
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
+#: ../data/gui/archiving_313_preferences_window.ui.h:6
 #, fuzzy
-msgid "group(s)"
-msgstr "Groups"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "when I'm in"
+msgid "Default:"
+msgstr "Default"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "None"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
+msgid "Yes"
 msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr ""
-
-#: ../data/gui/archiving_preferences_window.ui.h:4
 #, fuzzy
-msgid "Auto"
-msgstr "Auto join"
+msgid "Prefer"
+msgstr "Preferences"
 
-#: ../data/gui/archiving_preferences_window.ui.h:5
+#: ../data/gui/archiving_preferences_window.ui.h:4
 msgid "Concede"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr ""
 
-#: ../data/gui/archiving_preferences_window.ui.h:7
+#: ../data/gui/archiving_preferences_window.ui.h:6
 #, fuzzy
-msgid "No"
-msgstr "None"
+msgid "Auto"
+msgstr "Auto join"
+
+#: ../data/gui/archiving_preferences_window.ui.h:7
+msgid "<i>Method Auto</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
-msgid "Prefer"
-msgstr "Preferences"
+msgid "<i>Method Local</i>"
+msgstr ""
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
+msgid "<i>Method Manual</i>"
 msgstr ""
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:129
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blocked Contacts"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:606
+#: ../src/roster_window.py:5742 ../src/roster_window.py:5857
 msgid "_Unblock"
 msgstr "_Unblock"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>Message:</b> "
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Set Activity"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "Set an activity"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
-msgstr "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
+msgstr "<b>Message:</b> "
 
-#: ../data/gui/change_mood_dialog.ui.h:2
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Mood:</b>"
 msgstr "<b>Mood:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:2
+msgid "<b>Message:</b>"
+msgstr "<b>Message:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Change Password"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Enter it again for confirmation:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enter new password:"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "Enter it again for confirmation:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Type your new status message</b>"
+msgid "Save as Preset..."
+msgstr "Save as Preset..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
+msgid "Preset messages:"
+msgstr "Preset messages:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:7
 msgid "Activity:"
 msgstr "Activity:"
 
-#: ../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
 msgid "Mood:"
 msgstr "Mood:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:4
-msgid "Preset messages:"
-msgstr "Preset messages:"
-
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "Save as Preset..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Type your new status message</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "Join _Group Chat"
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "_Add to Roster..."
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "_Copy JID/E-mail Address"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "_Open E-mail Composer"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
 msgid "_Start Chat"
 msgstr "_Start Chat"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "_Add to Roster..."
+
+#: ../data/gui/chat_control.ui.h:1
+#, fuzzy
+msgid "<b>1</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr ""
+#, fuzzy
+msgid "<b>2</b> abc"
+msgstr "<b>Font</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>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:4
-msgid "1"
-msgstr ""
+#, fuzzy
+msgid "<b>4</b> ghi"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:5
-msgid "2"
-msgstr ""
+#, fuzzy
+msgid "<b>5</b> jkl"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:6
-msgid "3"
-msgstr ""
+#, fuzzy
+msgid "<b>6</b> mno"
+msgstr "<b>Font</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>Font</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>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:11
-msgid "8"
-msgstr ""
+#, fuzzy
+msgid "<b>0</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/chat_control.ui.h:12
-msgid "9"
-msgstr ""
+#, fuzzy
+msgid "<b>#</b>"
+msgstr "<b>Font</b>"
 
-#: ../data/gui/chat_control.ui.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Add this contact to roster (Ctrl+D)"
+#: ../data/gui/chat_control.ui.h:13 ../data/gui/gajim_themes_window.ui.h:10
+msgid "Bold"
+msgstr "Bold"
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Browse the chat history (Ctrl+H)"
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/gajim_themes_window.ui.h:11
+msgid "Italic"
+msgstr "Italic"
 
 #: ../data/gui/chat_control.ui.h:15
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Invite contacts to the conversation (Ctrl+G)"
+msgid "Underline"
+msgstr "Underline"
 
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:16
+msgid "Strike"
+msgstr "Strike"
+
+#: ../data/gui/chat_control.ui.h:17 ../src/advanced_configuration_window.py:99
+msgid "Color"
+msgstr "Colour"
+
+#: ../data/gui/chat_control.ui.h:18
+msgid "Font"
+msgstr "Font"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Clear formatting"
+msgstr "Clear formating"
+
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/groupchat_control.ui.h:1
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Show a list of emoticons (Alt+M)"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
-msgid "Show a list of formattings"
-msgstr "Show a list of formattings"
+#: ../data/gui/chat_control.ui.h:21
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "Add this contact to roster (Ctrl+D)"
+
+#: ../data/gui/chat_control.ui.h:22
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "Invite contacts to the conversation (Ctrl+G)"
 
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
+#: ../data/gui/chat_control.ui.h:23
 #, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Show a menu of advanced functions (Alt+A)"
+msgid "Show the contact&apos;s profile (Ctrl+I)"
+msgstr "Show the contact's profile (Ctrl+I)"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Show the contact's profile (Ctrl+I)"
 
-#: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
-msgstr ""
+#: ../data/gui/chat_control.ui.h:25 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "Browse the chat history (Ctrl+H)"
 
-#: ../data/gui/chat_control.ui.h: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 "Show a menu of advanced functions (Alt+A)"
 
-#. 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 "#"
+
+#: ../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 "_Send"
 
-#: ../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 "Send message"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "In_vite"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Invite Friends!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "MUC server"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+#, fuzzy
+msgid ""
+"You are now entering a groupchat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Please select a MUC server."
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
+msgid "MUC server"
+msgstr "MUC server"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "In_vite"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "A_sk to see his/her status"
+msgid "Start _Chat"
+msgstr "Start _Chat"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "Add Special _Notification..."
+#. 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 "Send Single _Message..."
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "Assign Open_PGP Key..."
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "E_xecute Command..."
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "Edit _Groups..."
+msgid "Send _File..."
+msgstr "Send _File..."
 
-#. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5832
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "Invite _Contacts"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "Remo_ve"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "Toggle End to End Encryption"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:554
+#: ../src/roster_window.py:5695
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:574
+msgid "E_xecute Command..."
+msgstr "E_xecute Command..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "Send Single _Message..."
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "_Manage Contact"
 
-#: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "Send _File..."
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:595
+#: ../src/roster_window.py:5725
+msgid "_Rename..."
+msgstr "_Rename..."
 
-#: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "Set Custom _Avatar..."
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5848
+msgid "Edit _Groups..."
+msgstr "Edit _Groups..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "Start _Chat"
+msgid "Assign Open_PGP Key..."
+msgstr "Assign Open_PGP Key..."
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "Toggle End to End Encryption"
+msgid "Set Custom _Avatar..."
+msgstr "Set Custom _Avatar..."
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "Toggle Open_PGP Encryption"
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification..."
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "_Subscription"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "_Allow him/her to see my status"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "A_llow this contact to view my status"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
-msgid "_Block"
-msgstr "_Block"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "A_sk to see his/her status"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "_Forbid him/her to see my status"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
-msgid "_History"
-msgstr "_History"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "_Ignore"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:609
+#: ../src/roster_window.py:5747 ../src/roster_window.py:5861
+msgid "_Block"
+msgstr "_Block"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "_Manage Contact"
+msgid "_Unignore"
+msgstr "_Unignore"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "_Rename..."
+msgid "_Ignore"
+msgstr "_Ignore"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "_Subscription"
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:617
+#: ../src/roster_window.py:5754
+msgid "Remo_ve"
+msgstr "Remo_ve"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "_Unignore"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:5927
+msgid "_History"
+msgstr "_History"
 
 #: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
@@ -1239,60 +1175,59 @@ msgid "Edit Groups"
 msgstr "Edit Groups"
 
 #: ../data/gui/esession_info_window.ui.h:1
-msgid "(<b>ESession</b> info)"
-msgstr "(<b>ESession</b> info)"
-
-#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verify"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "Features"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>List of possible features in Gajim:</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "Features"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "A list of active, completed and stopped file transfers"
+#, fuzzy
+msgid "Con_tinue"
+msgstr "_Continue"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "Cancel file transfer"
+msgid "_Pause"
+msgstr "_Pause"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "Cancels the selected file transfer"
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Cancels the selected file transfer and removes incomplete file"
+#: ../data/gui/filetransfers.ui.h:4 ../src/chat_control.py:2029
+#: ../src/filetransfers_window.py:214
+msgid "_Open Containing Folder"
+msgstr "_Open Containing Folder"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "Clean _up"
-
-#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "File Transfers"
 
+#: ../data/gui/filetransfers.ui.h:6
+msgid "file transfers list"
+msgstr "file transfers list"
+
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "Hides the window"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "A list of active, completed and stopped file transfers"
 
 #: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "Remove file transfer from the list."
+msgid "Clean _up"
+msgstr "Clean _up"
 
 #: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Removes completed, cancelled and failed file transfers from the list"
 
 #: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "Shows a list of file transfers between you and others"
+msgid "Remove file transfer from the list."
+msgstr "Remove file transfer from the list."
 
 #: ../data/gui/filetransfers.ui.h:11
 msgid ""
@@ -1303,81 +1238,90 @@ msgstr ""
 "active, it is first stopped and then removed"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "Show a pop-up notification when a file transfer is complete "
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "Cancels the selected file transfer and removes incomplete file"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continue"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "Cancel file transfer"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "_Notify me when a file transfer is complete"
+msgid "Cancels the selected file transfer"
+msgstr "Cancels the selected file transfer"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Open Containing Folder"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "Hides the window"
 
 #: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "_Pause"
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Notify me when a file transfer is complete"
 
 #: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "file transfers list"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Chatstate Tab Colours</b>"
+#: ../data/gui/filetransfers.ui.h:18
+msgid "Shows a list of file transfers between you and others"
+msgstr "Shows a list of file transfers between you and others"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/gajim_themes_window.ui.h:1
 #, fuzzy
 msgid "Account row"
 msgstr "Account"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
-msgid "Bold"
-msgstr "Bold"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Group row"
+msgstr "Group"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+#, fuzzy
+msgid "Contact row"
+msgstr "Contact"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "Composing"
+msgid "Gajim Themes Customization"
+msgstr "Gajim Themes Customisation"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
-msgid "Contact row"
-msgstr "Contact"
+msgid "Text _color:"
+msgstr "Text _colour:"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "Font style:"
+msgid "_Background:"
+msgstr "_Background:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim Themes Customisation"
+msgid "Text _font:"
+msgstr "Text _font:"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "Gone"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
-msgid "Group row"
-msgstr "Group"
+msgid "Font style:"
+msgstr "Font style:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactive"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
-msgid "Italic"
-msgstr "Italic"
-
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "Composing"
+
+#: ../data/gui/gajim_themes_window.ui.h:14
+msgid "Paused"
+msgstr "Paused"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "Gone"
+msgstr "Gone"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
 msgid ""
 "MUC\n"
 "Messages"
@@ -1385,7 +1329,7 @@ msgstr ""
 "MUC\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1393,149 +1337,135 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "Paused"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "Text _colour:"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "Text _font:"
-
 #: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "_Background:"
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Chatstate Tab Colours</b>"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "Change _Nickname..."
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "_Manage Room"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "Change _Subject..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "Configure _Room..."
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "_Bookmark"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "_Destroy Room"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "_Manage Room"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "_Minimise on close"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "_Voice"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1803
+msgid "_Bookmark"
+msgstr "_Bookmark"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:10 ../src/roster_window.py:5919
+msgid "_Disconnect"
+msgstr "_Disconnect"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "Mo_derator"
+msgid "_Send Private Message"
+msgstr "_Send Private Message"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "Occupant Actions"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "Send _File"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "Occupant Actions"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "_Add to Roster"
+msgid "_Voice"
+msgstr "_Voice"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Member"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "_Ban"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "_Owner"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "_Kick"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "_Member"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "_Owner"
+msgid "_Ban"
+msgstr "_Ban"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "_Send Private Message"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "_Voice"
+msgid "_Add to Roster"
+msgstr "_Add to Roster"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Bookmark this room (Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:365
+msgid "Show a list of formattings"
+msgstr "Show a list of formattings"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "Change your nickname (Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr "Change the room's subject (Alt+T)"
 
-#: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Change your nickname (Ctrl+N)"
+#: ../data/gui/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "Bookmark this room (Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Create new post"
 
 #: ../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 "From:"
 
 #: ../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 "Subject:"
 
 #: ../data/gui/history_manager.ui.h:1
-msgid ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-msgstr ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-
-#: ../data/gui/history_manager.ui.h:3
-msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "Delete"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Export"
+#, fuzzy
+msgid "_Export"
 msgstr "Export"
 
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:2
 msgid "Gajim History Logs Manager"
 msgstr "Gajim History Logs Manager"
 
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+
+#: ../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"
@@ -1549,172 +1479,180 @@ msgstr ""
 "Use this program to delete or export logs. You can select logs from the left "
 "and/or search database from below."
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:7
+msgid ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Search Database"
 
-#: ../data/gui/history_window.ui.h:1
-#, fuzzy
-msgid "All Chat Histories"
-msgstr "Old stories"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1 ../src/history_window.py:337
 msgid "Conversation History"
 msgstr "Conversation History"
 
+#: ../data/gui/history_window.ui.h:2
+msgid "Search:"
+msgstr "Search:"
+
 #: ../data/gui/history_window.ui.h:3
-#, fuzzy
-msgid "Enter JID or Contact name"
-msgstr "Contact name"
+msgid "_In date search"
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:4
-#, fuzzy
-msgid "Groupchat Histories"
-msgstr "Groupchats"
+msgid "Searching only in the selected day "
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:5
-msgid "Search:"
-msgstr "Search:"
-
-#: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
+#: ../data/gui/history_window.ui.h:6
+#, fuzzy
+msgid "_Show status changes"
+msgstr "_Log status changes of contacts"
+
 #: ../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 "message"
 
 #: ../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 "message"
+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 "Hot"
+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 "Hot"
 
 #: ../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 "_Browse"
-
-#: ../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 "Join Group Chat"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
-msgid "Join this room _automatically when I connect"
-msgstr "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:3
+msgid "Recently:"
+msgstr "Recently:"
 
-#: ../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 "Nickname:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Password:"
-msgstr "Password:"
-
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "Recently:"
-
-#: ../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 "Room:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:6 ../src/config.py:1870
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/gui/join_groupchat_window.ui.h:10
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Password:"
+msgstr "Password:"
+
+#: ../data/gui/join_groupchat_window.ui.h:8
 #, fuzzy
 msgid "_Bookmark this room"
 msgstr "Bookmark this room"
 
-#: ../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 "Join this room automatically when I connect"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Browse"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:2060
+#: ../src/disco.py:1807
 msgid "_Join"
 msgstr "_Join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "Auto join"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "If ticked, Gajim will join this group chat on startup"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Manage Bookmarks"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+#, fuzzy
+msgid "_Title:"
+msgstr "Title:"
+
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "Minimise on Auto Join"
+msgid "Roo_m:"
+msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "Print status:"
+#, fuzzy
+msgid "A_uto join"
+msgstr "Auto join"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "If ticked, Gajim will join this group chat on startup"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "Minimise on Auto Join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "Title:"
+#, fuzzy
+msgid "Pr_int status:"
+msgstr "Print status:"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1725,142 +1663,130 @@ msgid "_Configure"
 msgstr "_Configure"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>Properties</b>"
+#, fuzzy
+msgid "HTTP Connect"
+msgstr ""
+"HTTP Connect\n"
+"SOCKS5\n"
+"BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>Settings</b>"
+msgid "SOCKS5"
+msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr ""
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
-msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Manage Proxy Profiles"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Name:"
+msgstr "_Name:"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "Pass_word:"
+msgid "_Type:"
+msgstr "_Type:"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "Proxy _Host:"
+msgid "<b>Properties</b>"
+msgstr "<b>Properties</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr ""
+msgid "Proxy _Host:"
+msgstr "Proxy _Host:"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Use HTTP prox_y"
 
 #: ../data/gui/manage_proxies_window.ui.h:11
-msgid "Use proxy auth_entication"
-msgstr "Use proxy auth_entication"
+msgid "Proxy _Port:"
+msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Use proxy auth_entication"
+msgstr "Use proxy auth_entication"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "_Name:"
+msgid "_Username:"
+msgstr "_Username:"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "_Type:"
+msgid "Pass_word:"
+msgstr "Pass_word:"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "_Username:"
+msgid "<b>Settings</b>"
+msgstr "<b>Settings</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "Manage Accounts"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
+msgid "Plugins"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
+msgid "Install from zip"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
-msgid "Authors:"
-msgstr "Au_thorise"
+msgid "&lt;empty&gt;"
+msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:4
 #, fuzzy
-msgid "Available"
-msgstr "_Available"
+msgid "Version:"
+msgstr "GTK+ Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
 #, fuzzy
-msgid "Configure"
-msgstr "_Configure"
+msgid "Authors:"
+msgstr "Au_thorise"
 
 #: ../data/gui/plugins_window.ui.h:6
 #, fuzzy
-msgid "Descrition:"
-msgstr "Description: "
+msgid "Homepage:"
+msgstr "<b>Homepage:</b>"
 
 #: ../data/gui/plugins_window.ui.h:7
 #, fuzzy
-msgid "Homepage:"
-msgstr "<b>Homepage:</b>"
+msgid "Description:"
+msgstr "Description: "
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
+msgid "Uninstall"
 msgstr ""
 
 #: ../data/gui/plugins_window.ui.h:9
 #, fuzzy
+msgid "Configure"
+msgstr "_Configure"
+
+#: ../data/gui/plugins_window.ui.h:10
+#, fuzzy
 msgid "Installed"
 msgstr "Stalled"
 
-#: ../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 "GTK+ Version:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
-msgstr ""
-
 #: ../data/gui/popup_notification_window.ui.h:1
 #, fuzzy
 msgid "Event Type"
@@ -1872,1090 +1798,1102 @@ msgid "Event desc"
 msgstr "Events"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Advanced Configuration Editor</b>"
+#, fuzzy
+msgid "Use default applications"
+msgstr "Always use OS/X default applications"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>Applications</b>"
+msgid "Custom"
+msgstr "Custom"
 
 #: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>Actions</b>"
+msgid "All chat states"
+msgstr "All statuses"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>Auto Status</b>"
-
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>Chat Appearance</b>"
+#, fuzzy
+msgid "Composing only"
+msgstr "Composing"
 
-#: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chat Line Colours</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:162
+#: ../src/config.py:654
+msgid "Disabled"
+msgstr "Disabled"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>Chat state notifications</b>"
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Never\n"
+"Only when pending events\n"
+"Always"
 
-#: ../data/gui/preferences_window.ui.h:8
+#: ../data/gui/preferences_window.ui.h:9
 #, fuzzy
-msgid "<b>Connection</b>"
-msgstr "<b>Conditions</b>"
+msgid "Pop it up"
+msgstr "_Pop it up"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>Custom</b>"
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notify me about it"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Show only in _roster"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail Options</b>"
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Preset Status Messages</b>"
+msgid "Single window for everything"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>Privacy</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>Roster Appearance</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "Last status: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>Status Messages</b>"
+msgid "Preferences"
+msgstr "Preferences"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>Themes</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Display a_vatars of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
-msgid "<b>Video</b>"
-msgstr "<b>Middle:</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"If ticked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visual Notifications</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "Display status _messages of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name, in roster window and in group chats"
 msgstr ""
+"If ticked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "Advanced"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "Display m_ood of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "Advanced..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"If ticked, Gajim will display the mood of contacts in the roster window"
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
-msgid "All chat states"
-msgstr "All statuses"
+msgid "Sort contacts by status"
+msgstr "Sort contacts by status"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "Allow _OS information to be sent"
+msgid "in _roster"
+msgstr "in _roster"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
-msgid "Allow my _idle time to be sent"
-msgstr "Allow _OS information to be sent"
+msgid "in _group chats"
+msgstr "in _group chats"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Roster Appearance</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "Allow sound when I'm _busy"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
-msgid "Always"
-msgstr "Away"
+msgid "_Emoticons:"
+msgstr "_Emoticons:"
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "Ask status message when I:"
+msgid "_Window behavior:"
+msgstr "_Window behaviour:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "_Show roster on startup:"
+msgstr "Show _roster"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr ""
+msgid "Ma_ke message windows compact"
+msgstr "Ma_ke message windows compact"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr ""
+msgid "Hide all buttons in chat windows"
+msgstr "Hide all buttons in chat windows"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "Chat message:"
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignore rich content in incoming messages"
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Check on startup if Gajim is the _default Jabber client"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Some messages may include rich content (formatting, colours etc). If ticked, "
+"Gajim will just display the raw message text."
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
-msgid "Composing only"
-msgstr "Composing"
+msgid "_Highlight misspelled words"
+msgstr "_Highlight misspelt words"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "Configure colour and font of the interface"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"If ticked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
 
 #: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
-msgid "Contact's message:"
-msgstr "Chat message:"
+msgid "Show icon when your messages are received"
+msgstr "Sound to play when any MUC message arrives."
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
-msgid "Contact's nickname:"
-msgstr "Contact name"
+msgid "Show avatar in chat tabs"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "Custom"
-
-#: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Chat Appearance</b>"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgid "When new event is received:"
+msgstr "When new event is received:"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr ""
+msgid "Notify me about contacts that sign _in"
+msgstr "Notify me about contacts that sign _in"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr ""
+msgid "Notify me about contacts that sign _out"
+msgstr "Notify me about contacts that sign _out"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "Disabled"
+#: ../data/gui/preferences_window.ui.h:46
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim will notify you via a pop-up window in the bottom right of the screen "
+"about contacts that just signed out"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "Display _activity of contacts in roster"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "Display _extra e-mail details"
+#, fuzzy
+msgid "Allow popup/notifications when a chat window is opened"
+msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
-msgid "Display _location of contacts in roster"
-msgstr "Display m_ood of contacts in roster"
+msgid "Notify on new _GMail email"
+msgstr "Notify on new _GMail email"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "Display _tunes of contacts in roster"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"If ticked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "Display a_vatars of contacts in roster"
+msgid "Display _extra email details"
+msgstr "Display _extra e-mail details"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "Display m_ood of contacts in roster"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr ""
+"If ticked, Gajim will also include information about the sender of the new e-"
+"mails"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "Display status _messages of contacts in roster"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Options</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
-msgstr ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
+#, fuzzy
+msgid "Show notification area icon:"
+msgstr "Use t_rayicon (aka. notification area icon)"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
-msgstr ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Visual Notifications</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 will notify you via a pop-up window in the bottom right of the screen "
-"about contacts that just signed out"
+msgid "Play _sounds"
+msgstr "Play _sounds"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Ma_nage..."
+msgstr "Ma_nage..."
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "Hide all buttons in chat windows"
+msgid "Allow sound when I'm _busy"
+msgstr "Allow sound when I'm _busy"
 
 #: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr ""
-"If ticked, Gajim will allow others to detect the operation system you are "
-"using"
+msgid "<b>Sounds</b>"
+msgstr "<b>Sounds</b>"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr ""
-"If ticked, Gajim will also include information about the sender of the new e-"
-"mails"
+msgid "Notifications"
+msgstr "Notifications"
 
 #: ../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 ""
-"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr ""
-"If ticked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
+msgid "_Display chat state notifications:"
+msgstr "_Display chat state notifications:"
 
 #: ../data/gui/preferences_window.ui.h:63
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+"Gajim can 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 ""
-"If ticked, 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."
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"If ticked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+msgid "_Send chat state notifications:"
+msgstr "_Send chat state notifications:"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr ""
-"If ticked, Gajim will display the activity of contacts in the roster window"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Chat state notifications</b>"
 
 #: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr ""
-"If ticked, Gajim will display the mood of contacts in the roster window"
+msgid "Personal Events"
+msgstr "Personal Events"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr ""
-"If ticked, Gajim will display the mood of contacts in the roster window"
+msgid "_Away after:"
+msgstr "_Away after:"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
+"If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"If ticked, Gajim will display the tunes of contacts in the roster window"
+"If ticked, Gajim will change status to Away when the computer is unused."
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
-"If ticked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
+msgid "_Not available after:"
+msgstr "_Not available after:"
 
 #: ../data/gui/preferences_window.ui.h:70
 msgid ""
-"If checked, Gajim will ignore incoming events from unauthorized contacts. "
-"Use with caution, because it blocks all messages from any contact that is "
-"not in the roster"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 msgstr ""
-"If ticked, Gajim will ignore incoming events from unauthorised contacts. Use "
-"with caution, because it blocks all messages from any contact that is not in "
-"the roster"
+"If ticked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
-msgstr ""
-"If ticked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
+msgid "minutes"
+msgstr "minutes"
 
 #: ../data/gui/preferences_window.ui.h:72
 msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr ""
-"If ticked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-
-#: ../data/gui/preferences_window.ui.h:73
-msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
-msgstr ""
-"If ticked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent MSN icon for status online, away, busy, "
-"etc...)"
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
-"If 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"
 
 #: ../data/gui/preferences_window.ui.h:75
 msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-
-#: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "Log _encrypted chat session"
-
-#: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "Ma_ke message windows compact"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "Ma_nage..."
+msgid "12"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
-msgid "Never"
-msgstr "_Never"
+msgid "20"
+msgstr "0"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "Notifications"
+msgid "<b>Auto Status</b>"
+msgstr "<b>Auto Status</b>"
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "Notify me about contacts that sign _in"
+msgid "Ask status message when I:"
+msgstr "Ask status message when I:"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "Notify me about contacts that sign _out"
+msgid "Sign _in"
+msgstr "Sign _in"
 
 #: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
-msgid "Notify me about it"
-msgstr "_Notify me about it"
+msgid "Sign _out"
+msgstr "Sign _out"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "Notify on new _GMail email"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
-msgid "Only when pending events"
-msgstr ""
-"Never\n"
-"Only when pending events\n"
-"Always"
+msgid "Status"
+msgstr "Status"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "Personal Events"
+msgid "Default Message"
+msgstr "Default Message"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "Play _sounds"
+msgid "Enabled"
+msgstr "Enabled"
 
 #: ../data/gui/preferences_window.ui.h:88
-#, fuzzy
-msgid "Pop it up"
-msgstr "_Pop it up"
+msgid "<b>Status Messages</b>"
+msgstr "<b>Status Messages</b>"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "Preferences"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Preset Status Messages</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 ""
+msgid "Chat message:"
+msgstr "Chat message:"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Use system _default"
+msgstr "Use system _default"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
-msgid "STUN server:"
-msgstr "Server:"
+msgid "<b>Font</b>"
+msgstr "<b>Font</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-#, fuzzy
-msgid "Show notification area icon:"
-msgstr "Use t_rayicon (aka. notification area icon)"
+msgid "T_heme:"
+msgstr "T_heme:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
-msgid "Show only in roster"
-msgstr "Show only in _roster"
+msgid "Status _iconset:"
+msgstr "Status _iconset:"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "Sign _in"
+msgid "Use _transports icons"
+msgstr "Use _transports icons"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "Sign _out"
+#, 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 ""
+"If ticked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent MSN icon for status online, away, busy, "
+"etc...)"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr ""
+msgid "Configure color and font of the interface"
+msgstr "Configure colour and font of the interface"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"Some messages may include rich content (formatting, colours etc). If ticked, "
-"Gajim will just display the raw message text."
+msgid "<b>Themes</b>"
+msgstr "<b>Themes</b>"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "Sort contacts by status"
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "Contact name"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "Status"
+#: ../data/gui/preferences_window.ui.h:100
+#, fuzzy
+msgid "Contact's message:"
+msgstr "Chat message:"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "Status _iconset:"
+msgid "_Status message:"
+msgstr "_Status message:"
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Style"
-msgstr "Style"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "Group Chat Message Highlight"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "T_heme:"
+#, fuzzy
+msgid "Your nickname:"
+msgstr "B_efore nickname:"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
-msgstr ""
-"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 "Error message: %s"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "_URL highlight:"
+msgstr "_URL highlight:"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "_Reset to Default Colors"
+msgstr "_Reset to Default Colours"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Chat Line Colours</b>"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Style"
+msgstr "Style"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Audio input device"
 msgstr ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "Use _transports icons"
+msgid "Audio output device"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
-msgid "Use default applications"
-msgstr "Always use OS/X default applications"
+msgid "<b>Audio</b>"
+msgstr "<b>Actions</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "Use system _default"
+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
-msgid "When new event is received:"
-msgstr "When new event is received:"
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Middle:</b>"
 
 #: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
-msgid "Your message:"
-msgstr "Error message: %s"
+msgid "STUN server:"
+msgstr "Server:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
-msgid "Your nickname:"
-msgstr "B_efore nickname:"
-
-#: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "_Away after:"
+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 "_Browser:"
+msgid "<i>(example: stun.iptel.org)</i>"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "_Display chat state notifications:"
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Conditions</b>"
 
-#: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "_Emoticons:"
+#: ../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 "_File manager:"
+msgid "_Mail client:"
+msgstr "_Mail client:"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelt words"
+msgid "_Browser:"
+msgstr "_Browser:"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignore events from contacts not in the roster"
-
-#: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignore rich content in incoming messages"
+msgid "_File manager:"
+msgstr "_File manager:"
 
+#. 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 "_Log status changes of contacts"
+msgid "<b>Custom</b>"
+msgstr "<b>Custom</b>"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "_Mail client:"
+msgid "<b>Applications</b>"
+msgstr "<b>Applications</b>"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "_Not available after:"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignore events from contacts not in the roster"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "_Open..."
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"If ticked, Gajim will ignore incoming events from unauthorised contacts. Use "
+"with caution, because it blocks all messages from any contact that is not in "
+"the roster"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "_Reset to Default Colours"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "_Send chat state notifications:"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "_Status message:"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "_URL highlight:"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "_Window behaviour:"
+msgid "Log _encrypted chat session"
+msgstr "Log _encrypted chat session"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "in _group chats"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"If ticked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
 
 #: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "in _roster"
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Allow _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "minutes"
+msgid "Global proxy:"
+msgstr ""
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "Privacy Lists:"
+#: ../data/gui/preferences_window.ui.h:141
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacy</b>"
+
+#: ../data/gui/preferences_window.ui.h:142
+msgid "_Log status changes of contacts"
+msgstr "_Log status changes of contacts"
+
+#: ../data/gui/preferences_window.ui.h:144
+msgid "_Open..."
+msgstr "_Open..."
+
+#: ../data/gui/preferences_window.ui.h:145
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Advanced Configuration Editor</b>"
+
+#: ../data/gui/preferences_window.ui.h:146
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Add / Edit a rule</b>"
+#, fuzzy
+msgid "none"
+msgstr "one"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>List of rules</b>"
+#, fuzzy
+msgid "both"
+msgstr "Both"
 
 #: ../data/gui/privacy_list_window.ui.h:3
+#, fuzzy
+msgid "from"
+msgstr "From"
+
+#: ../data/gui/privacy_list_window.ui.h:4
+#, fuzzy
+msgid "to"
+msgstr "two"
+
+#: ../data/gui/privacy_list_window.ui.h:5 ../src/dialogs.py:4325
+msgid "Privacy List"
+msgstr "Privacy List"
+
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privacy List</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Active for this session"
 msgstr "Active for this session"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Active on each startup"
 msgstr "Active on each startup"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "All"
+#: ../data/gui/privacy_list_window.ui.h:9
+msgid "<b>List of rules</b>"
+msgstr "<b>List of rules</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "All (including subscription)"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Add / Edit a rule</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Allow"
 msgstr "Allow"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:12
 msgid "Deny"
 msgstr "Deny"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
-msgid "Privacy List"
-msgstr "Privacy List"
-
-#: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "all by subscription"
-
 #: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "all in the group"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
-msgid "both"
-msgstr "Both"
+msgid "all by subscription"
+msgstr "all by subscription"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
-msgid "from"
-msgstr "From"
+msgid "All"
+msgstr "All"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
-msgid "none"
-msgstr "one"
-
-#: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
-msgid "to"
-msgstr "two"
-
-#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "to send me messages"
 
-#: ../data/gui/privacy_list_window.ui.h:20
+#: ../data/gui/privacy_list_window.ui.h:18
 msgid "to send me queries"
 msgstr "to send me queries"
 
-#: ../data/gui/privacy_list_window.ui.h:21
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to view my status"
+msgstr "to view my status"
+
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me status"
 msgstr "to send me status"
 
+#: ../data/gui/privacy_list_window.ui.h:21
+msgid "All (including subscription)"
+msgstr "All (including subscription)"
+
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "to view my status"
+msgid "Order:"
+msgstr "Order:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>Address</b>"
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "Privacy Lists:"
 
 #: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>Avatar:</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+msgid "<b>Name:</b>"
+msgstr "<b>Name:</b>"
 
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>Birthday:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>City:</b>"
+#: ../data/gui/vcard_information_window.ui.h:16
+msgid "<b>Nickname:</b>"
+msgstr "<b>Nickname:</b>"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>Company:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>Country:</b>"
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Family:</b>"
+msgstr "<b>Family:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>Department:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Given:</b>"
+msgstr "<b>Given:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>Extra Address:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Middle:</b>"
+msgstr "<b>Middle:</b>"
 
-#. Family Name
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "<b>Family:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Prefix:</b>"
+msgstr "<b>Prefix:</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
+msgid "<b>Suffix:</b>"
+msgstr "<b>Suffix:</b>"
+
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:39
 msgid "<b>Full Name</b>"
 msgstr "<b>Full Name</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
-msgid "<b>Given:</b>"
-msgstr "<b>Given:</b>"
+msgid "<b>Street:</b>"
+msgstr "<b>Street:</b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>Homepage:</b>"
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:20
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Extra Address:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>Middle:</b>"
+#: ../data/gui/vcard_information_window.ui.h:18
+msgid "<b>City:</b>"
+msgstr "<b>City:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>Name:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Postal Code:</b>"
+msgstr "<b>Postal Code:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>Nickname:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>State:</b>"
+msgstr "<b>State:</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>Phone No.:</b>"
+#: ../data/gui/vcard_information_window.ui.h:22
+msgid "<b>Country:</b>"
+msgstr "<b>Country:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>Position:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Address</b>"
+msgstr "<b>Address</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>Postal Code:</b>"
+#: ../data/gui/vcard_information_window.ui.h:24
+msgid "<b>Homepage:</b>"
+msgstr "<b>Homepage:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>Prefix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:26
+msgid "<b>Phone No.:</b>"
+msgstr "<b>Phone No.:</b>"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>Role:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>Avatar:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>State:</b>"
+msgid "Click to set your avatar"
+msgstr "Click to set your avatar"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>Street:</b>"
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
+
+#: ../data/gui/profile_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>Birthday:</b>"
+msgstr "<b>Birthday:</b>"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>Suffix:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "Personal Info"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</b>"
+msgstr "<b>Company:</b>"
 
-#. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
-msgid "About"
-msgstr "About"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Department:</b>"
+msgstr "<b>Department:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "Click to set your avatar"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Position:</b>"
+msgstr "<b>Position:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>Role:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "Personal Info"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "Work"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>What do you want to do?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "About"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "Remove account from Gajim and from _server"
 
-#. Remove group
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>What do you want to do?</b>"
+
 #. Remove
-#: ../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 "_Remove"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-
-#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr "Message Body <currently unused, so it's hidden by default>"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Roster Item Exchange"
 msgstr "Roster Item Exchange"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../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 "_Actions"
+
+#: ../data/gui/roster_window.ui.h:6
 msgid "Add _Contact..."
 msgstr "Add _Contact..."
 
-#: ../data/gui/roster_window.ui.h:2
-msgid "Fea_tures"
-msgstr "Fea_tures"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "File _Transfers"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1518
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "Frequently Asked Questions (online)"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "Help online"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "Profile, A_vatar"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr ""
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "Profile, A_vatar"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "_View"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "Show Trans_ports"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:352
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "File _Transfers"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "_Actions"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "_Help"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
+msgid "Help online"
+msgstr "Help online"
+
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "_Edit"
+#: ../data/gui/roster_window.ui.h:23
+msgid "Frequently Asked Questions (online)"
+msgstr "Frequently Asked Questions (online)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:24
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
-msgid "_Help"
-msgstr "_Help"
-
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "_Send Single Message..."
-
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "_View"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "Please wait while retrieving search form..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "Fea_tures"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1 ../src/disco.py:1375
 msgid "Search"
 msgstr "Search"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "Please wait while retrieving search form..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:627
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5
 msgid "_Search"
 msgstr "_Search"
 
 #: ../data/gui/service_discovery_window.ui.h:1
-msgid "G_o"
-msgstr "G_o"
-
-#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Address:"
 
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "G_o"
+msgstr "G_o"
+
 #: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Register to"
 
-#: ../data/gui/service_registration_window.ui.h:2
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "Reply to this message"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "To:"
+msgstr "To:"
 
 #: ../data/gui/single_message_window.ui.h:4
-msgid "Sen_d"
-msgstr "Sen_d"
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "Send message"
+msgid "Sen_d"
+msgstr "Sen_d"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "Send message and close window"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "_Reply"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "To:"
+msgid "Reply to this message"
+msgstr "Reply to this message"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "_Reply"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Close"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "Send message and close window"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "Au_thorise"
+msgid "Subscription Request"
+msgstr "Subscription Request"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "Authorise contact so he or she can know when you're connected"
+msgid "_Deny"
+msgstr "_Deny"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2965,187 +2903,223 @@ msgstr ""
 "Deny authorisation from contact so he or she cannot know when you're "
 "connected"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "Subscription Request"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "Au_thorise"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "_Deny"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Authorise contact so he or she can know when you're connected"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "Synchronise contacts"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "Select the account with which you want to synchronise"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "Select the contacts you want to synchronise"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronise : select contacts"
 
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "Select the contacts you want to synchronise"
+
 #: ../data/gui/systray_context_menu.ui.h:1
+msgid "Sta_tus"
+msgstr "Sta_tus"
+
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "Show All Pending _Events"
+
+#: ../data/gui/systray_context_menu.ui.h:6
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "Send Single _Message"
+#: ../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 "Resource:"
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "Show All Pending _Events"
+#: ../data/gui/tooltip_roster_contact.ui.h:3
+#: ../data/gui/zeroconf_information_window.ui.h:4
+msgid "Status:"
+msgstr "Status:"
 
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Sta_tus"
-msgstr "Sta_tus"
+#: ../data/gui/tooltip_roster_contact.ui.h:4
+#, fuzzy
+msgid "Idle since:"
+msgstr " since %s"
 
-#: ../data/gui/systray_context_menu.ui.h:5
-msgid "_Group Chat"
-msgstr "_Group Chat"
+#: ../data/gui/tooltip_roster_contact.ui.h:5
+#, fuzzy
+msgid "Idle for:"
+msgstr "XML Console for %s"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>Ask:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:8
+#, fuzzy
+msgid "Tune:"
+msgstr "Tune:"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>Client:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:9
+#, fuzzy
+msgid "Location:"
+msgstr "Notification"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>Contact time:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:10
+#, fuzzy
+msgid "OpenPGP:"
+msgstr "OpenPGP: "
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/tooltip_roster_contact.ui.h:11
+msgid "Subscription:"
+msgstr "Subscription:"
+
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "Personal Information"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>Resource:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>Subscription:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>Client:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "Comments"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>Contact time:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>Avatar:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "Configured avatar:"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Ask:</b>"
+msgstr "<b>Ask:</b>"
+
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Subscription:</b>"
+msgstr "<b>Subscription:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Contact"
 msgstr "Contact"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "Personal Information"
-
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "More"
-msgstr "More"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "button"
+msgstr ""
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "User avatar:"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "Comments"
 
 #: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
-msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
-
-#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
+#. XML Console enable checkbutton
 #: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML Input</b>"
+msgid "_Enable"
+msgstr "_Enable"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
+msgid "Hide OUT stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
+msgid "Hide Presence stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
+msgid "Hide IQ stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
+msgid "Hide Message stanzas"
 msgstr ""
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "Info/Query"
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/gui/xml_console_window.ui.h:14
-msgid "_Message"
-msgstr "_Message"
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "Info/Query"
 
-#: ../data/gui/xml_console_window.ui.h:15
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_Presence"
 msgstr "_Presence"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
-msgid "_Modify Account..."
-msgstr "_Modify Account..."
+#: ../data/gui/xml_console_window.ui.h:14
+msgid "_Message"
+msgstr "_Message"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Input</b>"
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Local jid:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:11
 msgid "Personal"
 msgstr "Personal"
 
-#: ../data/gui/zeroconf_information_window.ui.h:8
-msgid "Resource:"
-msgstr "Resource:"
-
-#: ../data/gui/zeroconf_information_window.ui.h:9
-msgid "Status:"
-msgstr "Status:"
+#: ../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 "A GTK+ Jabber client"
+#: ../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 Instant Messenger"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
 
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "A GTK+ Jabber client"
+
 #: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
@@ -3166,7 +3140,7 @@ msgstr "Invalid room"
 msgid "The form is not filled correctly."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:414
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
@@ -3174,299 +3148,259 @@ msgstr "Service sent malformed data"
 msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
+#: ../src/adhoc_commands.py:419
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:514
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Activated"
 msgstr "Activated"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Deactivated"
 msgstr "Deactivated"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:96
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:97
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:98
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
-msgid "Color"
-msgstr "Colour"
-
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:110
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:117
 msgid "Value"
 msgstr "Value"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:126
 msgid "Type"
 msgstr "Type"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(None)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:312
 msgid "Hidden"
 msgstr "Hidden"
 
-#: ../src/atom_window.py:123
-#, fuzzy, 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] "You have received new entries (and %(count)d not displayed):"
-msgstr[1] "You have received new entries (and %(count)d not displayed):"
-
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
-msgid "English"
-msgstr "English"
+#: ../src/application.py:49
+#, fuzzy
+msgid "Show the application's version"
+msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "Belarusian"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "Breton"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "Czech"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "German"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "Greek"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "British"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "Spanish"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "Basque"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "French"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "Croatian"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "Italian"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "Norwegian (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "Dutch"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "Norwegian"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "Polish"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "Brazilian Portuguese"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "Russian"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "Serbian"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "Slovak"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "Swedish"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "Chinese (Ch)"
-
-#: ../src/chat_control.py:496
-msgid "Spelling language"
-msgstr "Spelling language"
+#: ../src/application.py:52
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "Show only in _roster"
 
-#. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
-msgid "A connection is not available"
-msgstr "A connection is not available"
+#: ../src/application.py:55
+msgid "Separate profile files completely (even history db and plugins)"
+msgstr ""
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
-msgid "Your message can not be sent until you are connected."
-msgstr "Your message can not be sent until you are connected."
+#: ../src/application.py:59
+msgid "Print xml stanzas and other debug information"
+msgstr ""
 
-#: ../src/chat_control.py:944
-msgid "Underline"
-msgstr "Underline"
+#: ../src/application.py:63
+msgid "Print stdout/stderr to the console on Windows"
+msgstr ""
 
-#: ../src/chat_control.py:945
-msgid "Strike"
-msgstr "Strike"
+#: ../src/application.py:67
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "Advanced Configuration Editor"
 
-#: ../src/chat_control.py:968
-msgid "Font"
-msgstr "Font"
+#: ../src/application.py:71
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "Room Configuration"
 
-#: ../src/chat_control.py:977
-msgid "Clear formating"
-msgstr "Clear formating"
+#: ../src/application.py:74
+msgid "Configure logging system"
+msgstr ""
 
-#: ../src/chat_control.py:1055
-msgid "Really send file?"
-msgstr "Really send file?"
+#: ../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 "Database Error"
 
-#: ../src/chat_control.py:1056
+#: ../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 "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "If you send a file to %s, he/she will know your real Jabber ID."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 
-#: ../src/chat_control.py:1520 ../src/chat_control.py:2010
-msgid "GPG encryption enabled"
+#: ../src/atom_window.py:124
+#, fuzzy, 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] "You have received new entries (and %(count)d not displayed):"
+msgstr[1] "You have received new entries (and %(count)d not displayed):"
+
+#: ../src/chat_control.py:307 ../src/chat_control.py:911
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG encryption enabled"
 
+#: ../src/chat_control.py:369
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:372
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "This contact does not support file transfer."
+
 #. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py: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 "Not in Roster"
 
-#: ../src/chat_control.py:1575
+#. 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:403
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr ""
+
+#: ../src/chat_control.py:405
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "Feature not available under Windows."
+
+#: ../src/chat_control.py:409
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:422
+#, fuzzy
+msgid "Send files"
+msgstr "Send _File"
+
+#: ../src/chat_control.py:428
 msgid "This contact does not support file transfer."
 msgstr "This contact does not support file transfer."
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:431
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "You need to know the real JID of the contact to send him or her a file."
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py: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 "Have "
+
+#: ../src/chat_control.py:753
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:891 ../src/dialogs.py:5403
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:892
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:2000
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:901
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:927
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:929
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:946
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:948
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:952
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:956
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2062
+#: ../src/chat_control.py:963
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3475,32 +3409,32 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:1102
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../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
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Session WILL NOT be logged"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:1123
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:1126
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:1128
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:1133
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3508,25 +3442,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:1135
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:1184 ../src/chat_control.py:1198
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:1190
 msgid "The following message was encrypted"
 msgstr "The following message was encrypted"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:1488
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:1490
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3534,13 +3468,12 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
-msgid "Database Error"
-msgstr "Database Error"
+#: ../src/chat_control.py:1521 ../src/groupchat_control.py:1390
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../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 "
@@ -3549,128 +3482,450 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:1704
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"Subject: %(subject)s\n"
+"%(message)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 ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+
+#: ../src/chat_control.py:1940
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
+#: ../src/chat_control.py:1999
+#, fuzzy
+msgid "File transfer"
+msgstr "File Transfers"
+
+#: ../src/chat_control.py:2002
+#, fuzzy
+msgid "Size"
+msgstr "Size: %s"
+
+#: ../src/chat_control.py:2004
+#, fuzzy
+msgid "_Accept"
+msgstr "Accept"
+
+#: ../src/chat_control.py:2025 ../src/filetransfers_window.py:212
+msgid "File transfer completed"
+msgstr "File transfer completed"
+
+#: ../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 "Groupchat Invitation"
+
+#: ../src/chat_control.py:2079 ../src/gui_interface.py:1040
+#: ../src/roster_window.py:2016
+msgid "Remote contact stopped transfer"
+msgstr "Remote contact stopped transfer"
+
+#: ../src/chat_control.py:2081 ../src/gui_interface.py:1043
+#: ../src/roster_window.py:2018
+msgid "Error opening file"
+msgstr "Error opening file"
+
+#: ../src/chat_control.py:2083 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "File transfer stopped"
+
+#: ../src/chat_control.py:2086 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:234
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: ../src/chat_control.py:2087 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:235
+msgid "Connection with peer cannot be established."
+msgstr "Connection with peer cannot be established."
+
+#. 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 "Usage: /%s, hide the chat buttons."
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "Usage: /%s, send the message to the contact"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr "%s not found"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:270
+#: ../src/tooltips.py:913
+msgid "Away"
+msgstr "Away"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "_Available"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "Usage: /%s, clears the text window."
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "Toggle Open_PGP Encryption"
+
+#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "Usage: /%s, sends a ping to the contact"
+
+#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
+#, fuzzy
+msgid "Command is not supported for zeroconf accounts"
+msgstr "Command not supported for zeroconf account."
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+#, fuzzy
+msgid "No open audio sessions with the contact"
+msgstr "Click to see past conversations with this contact"
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s is not a valid loglevel"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "A connection is not available"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "Connection not available"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "Change your nickname (Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3439
+#: ../src/dialogs.py:2195
+msgid "Invalid nickname"
+msgstr "Invalid nickname"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+msgid "Nickname not found"
+msgstr "Nickname not found"
+
+#: ../src/command_system/implementation/standard.py:293
+#, fuzzy
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "Send %s to %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "You are invited to a groupchat"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "Invalid server"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "affiliation changed"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "Usage: /%s , display the names of group chat occupants."
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:164 ../src/command_system/mapping.py:174
+#: ../src/command_system/mapping.py:194
+#, fuzzy
+msgid "Missing arguments"
+msgstr "Missing argument \"contact_jid\""
+
+#: ../src/command_system/mapping.py:261
+msgid "Excessive arguments"
+msgstr ""
+
 #: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
 #, fuzzy
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:326 ../src/common/check_paths.py:341
+#: ../src/common/check_paths.py:248
+#, fuzzy, python-format
+msgid "moving %s to %s"
+msgstr "Send %s to %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 is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py: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 will now exit"
 
-#: ../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 is a directory but should be a file"
 
-#: ../src/common/check_paths.py:351
-#, python-format
-msgid "creating %s directory"
-msgstr "creating %s directory"
-
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:329
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../src/common/commands.py:216 ../src/common/contacts.py: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
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "Forward unread messages"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 #, fuzzy
 msgid "Forward unread message then disconnect"
 msgstr "Forward unread messages"
 
+#: ../src/common/config.py: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 "Play sound when user is busy"
@@ -3692,7 +3947,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Away as a result of being idle more than $T min)"
 
 #: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S will be replaced by current status message, $T by autoaway time."
 
 #: ../src/common/config.py:84
@@ -3704,7 +3960,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Not available as a result of being idle more than $T min)"
 
 #: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
 #: ../src/common/config.py:88
@@ -3713,64 +3970,121 @@ msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:89
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:94
 msgid "Incoming nickname color."
 msgstr "Incoming nickname colour."
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:95
 msgid "Outgoing nickname color."
 msgstr "Outgoing nickname colour."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
 msgid "Incoming text color."
 msgstr "Incoming text colour."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
 msgid "Outgoing text color."
 msgstr "Outgoing text colour."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
 msgid "Status message text color."
 msgstr "Status message text colour."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "_Show event in roster"
+
+#. limegreen
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "_Show event in roster"
+
+#. red
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "Preview new messages in notification popup?"
+
+#. dodgerblue
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "File Transfer Request"
+
+#. khaki
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "File transfer cancelled"
+
+#. firebrick
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "Show a pop-up notification when a file transfer is complete "
+
+#. yellowgreen
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "Groupchat Invitation"
+
+#. tan1
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Background color of status changed notification"
+msgstr "Background colour of contacts when they just signed in."
+
+#. thistle2
+#: ../src/common/config.py:109
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:110
 msgid "Incoming nickname font."
 msgstr "Incoming nickname font."
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:111
 msgid "Outgoing nickname font."
 msgstr "Outgoing nickname font."
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:112
 msgid "Incoming text font."
 msgstr "Incoming text font."
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:113
 msgid "Outgoing text font."
 msgstr "Outgoing text font."
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:114
 msgid "Status message text font."
 msgstr "Status message text font."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:115
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../src/common/config.py: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
 msgid "default"
 msgstr "default"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:122
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../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"
@@ -3780,7 +4094,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py: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. "
@@ -3790,17 +4104,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:127
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../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 ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../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/"
@@ -3810,7 +4124,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:140
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3818,7 +4132,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../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."
@@ -3828,6 +4142,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"
@@ -3836,44 +4160,51 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3881,7 +4212,12 @@ msgstr ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3889,11 +4225,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3902,11 +4238,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3918,13 +4254,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3932,7 +4268,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3940,35 +4276,38 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimised)"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3976,28 +4315,34 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 #, fuzzy
 msgid "Notify of events in the notification area."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -4009,17 +4354,17 @@ msgstr ""
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 #, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
@@ -4028,13 +4373,7 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:222
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-
-#: ../src/common/config.py:223
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4042,7 +4381,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4050,11 +4389,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:255
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define the position of the avatar in roster. Can be left or right"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py: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."
@@ -4062,7 +4401,7 @@ msgstr ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py: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."
@@ -4070,9 +4409,10 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py: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 "
@@ -4084,29 +4424,33 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py: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 "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:264
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:265
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:266
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py: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 "
@@ -4116,7 +4460,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../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 "
@@ -4127,7 +4471,8 @@ msgstr ""
 "presences."
 
 #. 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"
 "'always' - All messages are sent to a single window.\n"
@@ -4135,7 +4480,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "Controls the window where new messages are placed.\n"
@@ -4147,31 +4492,39 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py: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 "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:275
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:276
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in chat windows."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:277
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:278
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:279
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py: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."
@@ -4179,15 +4532,15 @@ msgstr ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:281
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:282
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:283
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -4195,11 +4548,11 @@ msgstr ""
 "List of colours, separated by \":\", that will be used to colour nicknames "
 "in group chats."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:284
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:285
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4207,7 +4560,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -4215,7 +4568,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4223,7 +4576,7 @@ msgstr ""
 "Should we show the confirm custom status dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py: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 "
@@ -4233,23 +4586,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:262
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-
-#: ../src/common/config.py:263
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-msgstr ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-
-#: ../src/common/config.py:264
+#: ../src/common/config.py:289
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4257,7 +4594,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:290
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4265,7 +4602,7 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4273,19 +4610,11 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-
-#: ../src/common/config.py:268
+#: ../src/common/config.py:292
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:293
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4293,7 +4622,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:294
 #, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
@@ -4302,19 +4631,11 @@ msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:295
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../src/common/config.py:272
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr ""
-"Change the value to change the size of latex formulae displayed. The higher "
-"is larger."
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:296
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4322,19 +4643,20 @@ msgstr ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:297
+#, fuzzy
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "Ask offline status message to all offline contacts when connection to an "
 "account is established. WARNING: This causes a lot of requests to be sent!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:298
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "If True, completion in groupchats will be like a shell auto-completion"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:299
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4342,31 +4664,64 @@ msgstr ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 
-#: ../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
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+
+#: ../src/common/config.py: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."
@@ -4374,7 +4729,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py: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"
@@ -4382,37 +4737,37 @@ msgstr ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:339
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:341
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:342
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "If False, this account will be disabled and will not appear in roster window."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:345
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:347
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:348
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:349
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4420,49 +4775,77 @@ msgstr ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
+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
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:354
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:355
 #, fuzzy
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:358
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py: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 "Whitespace sent after inactivity"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:374
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../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."
@@ -4470,15 +4853,34 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py: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 "Answer to receipt requests"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../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 ""
+"If ticked, Gajim will allow others to detect the operation system you are "
+"using"
+
+#: ../src/common/config.py:407
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s wants to send you a file."
+
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4486,20 +4888,56 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:411
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py: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 "Anonymous authentication"
+
+#: ../src/common/config.py:416
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "Anon_ymous authentication"
+
+#: ../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 "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:482
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4507,108 +4945,108 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:483 ../src/common/config.py:486
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all or space separated status"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes', 'no', or 'both'"
+#: ../src/common/config.py:487
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many lines to request to server when entering a groupchat."
 
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes', 'no' or ''"
+#: ../src/common/config.py:488
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py: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 "Sleeping"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:515 ../src/config.py:1656
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../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."
@@ -4616,320 +5054,271 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:540 ../src/common/optparser.py:318
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:544 ../src/common/optparser.py:304
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
-msgstr "Unable to load idle module"
-
-#: ../src/common/connection_handlers.py:127
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registration information for transport %s has not arrived in time"
-
-#: ../src/common/connection_handlers.py:134
-msgid "Registration succeeded"
-msgstr "Registration succeeded"
-
-#: ../src/common/connection_handlers.py:135
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "Registration with agent %s succeeded"
-
-#: ../src/common/connection_handlers.py:143
-msgid "Registration failed"
-msgstr "Registration failed"
-
-#: ../src/common/connection_handlers.py:143
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "Disk Write Error"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
-msgid "Invisibility not supported"
-msgstr "Invisibility not supported"
-
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "Account %s doesn't support invisibility."
-
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "A message from a non-valid JID arrived, it has been ignored."
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+#: ../src/common/config.py:559
+#, fuzzy
+msgid "Tor"
+msgstr "To"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:98
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:99
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:100
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:101
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:102
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:103
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:104
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:105
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../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 "Invalid Jabber ID"
+
+#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/dialogs.py:3303
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "It is not possible to send a message to %s, this JID is not valid."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:313
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Neither the remote presence is signed, nor a key was assigned."
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:316
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "The contact's key (%s) does not match the key assigned in Gajim."
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:374
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:441
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"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 "Disk Write Error"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:978
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:979
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:990
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:1032
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "Unknown SSL error: %d"
-
-#. wrong answer
-#: ../src/common/connection.py:884
+#: ../src/common/connection.py:1049
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:1050
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1177
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "Use custom hostname/port"
+
+#: ../src/common/connection.py:1359
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:1362
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1364 ../src/common/connection.py:1557
+#: ../src/gui_interface.py:551
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1369
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server replied: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1384
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1422 ../src/common/connection.py:1532
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1423 ../src/common/connection.py:1533
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account %s has been lost. Retry connecting."
 
-#: ../src/common/connection.py:1243
-#, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+#: ../src/common/connection.py:1457
+#, fuzzy, python-format
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1460
 #, python-format
 msgid ""
 "\n"
@@ -4938,7 +5327,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1462
 #, python-format
 msgid ""
 "\n"
@@ -4947,24 +5336,33 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:1297
-msgid "Check your connection or try again later"
-msgstr "Check your connection or try again later"
+#: ../src/common/connection.py:1508
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "The authenticity of the %s certificate could be invalid."
+
+#: ../src/common/connection.py:1556 ../src/common/connection.py:2351
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1592
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1593
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1669
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../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 "
@@ -4973,66 +5371,234 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1658
+#: ../src/common/connection.py:1863 ../src/common/connection.py:1977
+msgid "Invisibility not supported"
+msgstr "Invisibility not supported"
+
+#: ../src/common/connection.py:1864 ../src/common/connection.py:1978
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "Account %s doesn't support invisibility."
+
+#: ../src/common/connection.py:2215
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
+#: ../src/common/connection.py:2218
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
-#: ../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 "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:3001
 msgid "Unregister failed"
 msgstr "Unregister failed"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:3002
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Unregistration with server %(server)s failed: %(error)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/connection_handlers.py:89
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "Unable to load idle module"
+
+#: ../src/common/connection_handlers.py:124
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registration information for transport %s has not arrived in time"
+
+#: ../src/common/connection_handlers.py:132
+msgid "Registration succeeded"
+msgstr "Registration succeeded"
+
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "Registration with agent %s succeeded"
+
+#: ../src/common/connection_handlers.py:142
+msgid "Registration failed"
+msgstr "Registration failed"
+
+#: ../src/common/connection_handlers.py:143
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:1948
+msgid "I would like to add you to my roster."
+msgstr "I would like to add you to my roster."
+
+#: ../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 is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+
+#: ../src/common/connection_handlers_events.py:871
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "unsubscribe request from %s"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:978
+msgid "Room has been destroyed"
+msgstr "Room has been destroyed"
+
+#: ../src/common/connection_handlers_events.py:986
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "You can join this room instead: %s"
+
+#: ../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 "A message from a non-valid JID arrived, it has been ignored."
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1246 ../src/gui_interface.py:441
+#: ../src/gui_interface.py:455
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "error while sending %(message)s ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1485
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1851
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "Unknown SSL error: %d"
+
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Single Message"
+msgstr "New Single Message"
+
+#: ../src/common/connection_handlers_events.py:2485
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "New Single Message from %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2974
+#: ../src/notify.py:278
+msgid "New Private Message"
+msgstr "New Private Message"
+
+#: ../src/common/connection_handlers_events.py:2491
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "New Private Message from group chat %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
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Messaged by %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2501 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Message"
+msgstr "New Message"
+
+#: ../src/common/connection_handlers_events.py:2503
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "New Message from %(nickname)s"
+
+#: ../src/common/connection_handlers_events.py:2669
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Changed Status"
+
+#: ../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 is now %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2675 ../src/dialogs.py:2985
+#: ../src/notify.py:291
+msgid "Contact Changed Status"
+msgstr "Contact Changed Status"
+
+#: ../src/common/connection_handlers_events.py:2677
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Signed In"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2681 ../src/dialogs.py:2969
+#: ../src/notify.py:273
+msgid "Contact Signed In"
+msgstr "Contact Signed In"
+
+#: ../src/common/connection_handlers_events.py:2683
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Signed Out"
+
+#: ../src/common/connection_handlers_events.py:2687 ../src/dialogs.py:2971
+#: ../src/notify.py:275
+msgid "Contact Signed Out"
+msgstr "Contact Signed Out"
+
+#: ../src/common/contacts.py:133 ../src/common/helpers.py:73
+#: ../src/gui_interface.py:493
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#. 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 "Transports"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:373
 msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus does not run correctly on this machine"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus does not run correctly on this machine"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 #, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus does not run correctly on this machine"
@@ -5046,7 +5612,7 @@ msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Service not available: Gajim is not running, or remote_control is False"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:57
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
@@ -5068,430 +5634,457 @@ msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "twelve"
 msgstr "twelve"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "one"
 msgstr "one"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "two"
 msgstr "two"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "three"
 msgstr "three"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "four"
 msgstr "four"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "five"
 msgstr "five"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "six"
 msgstr "six"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "seven"
 msgstr "seven"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "eight"
 msgstr "eight"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "nine"
 msgstr "nine"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "ten"
 msgstr "ten"
 
-#: ../src/common/fuzzyclock.py:40
+#: ../src/common/fuzzyclock.py:39
 msgid "eleven"
 msgstr "eleven"
 
 #. 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 "%(0)s o'clock"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "five past %(0)s"
 msgstr "five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "ten past %(0)s"
 msgstr "ten past %(0)s"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "quarter past %(0)s"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "twenty past %(0)s"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "twenty five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
 msgstr "half past %(0)s"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "twenty five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "twenty to %(1)s"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "quarter to %(1)s"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "ten to %(1)s"
 msgstr "ten to %(1)s"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "five to %(1)s"
 msgstr "five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s o'clock"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:50
 msgid "Night"
 msgstr "Night"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Early morning"
 msgstr "Early morning"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Morning"
 msgstr "Morning"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Almost noon"
 msgstr "Almost noon"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Noon"
 msgstr "Noon"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Afternoon"
 msgstr "Afternoon"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Evening"
 msgstr "Evening"
 
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:50
 msgid "Late evening"
 msgstr "Late evening"
 
-#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:52
 msgid "Start of week"
 msgstr "Start of week"
 
-#: ../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 "Middle of week"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "End of week"
 msgstr "End of week"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../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 "Invalid character in username."
 
-#: ../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 "Invalid character in hostname."
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:197
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../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 "Invalid character in resource."
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:246
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:248 ../src/tooltips.py:915
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:251
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:253 ../src/tooltips.py:917
+msgid "Not Available"
+msgstr "Not Available"
+
+#: ../src/common/helpers.py:256
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:258 ../src/tooltips.py:911
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:261
 #, fuzzy
 msgid "?user status:_Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:263 ../src/tooltips.py:909
 #, fuzzy
 msgid "?user status:Available"
 msgstr "Paused"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:265
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:268
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:273
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:275 ../src/tooltips.py:919
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:278
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:280
+msgid "Invisible"
+msgstr "Invisible"
+
+#: ../src/common/helpers.py:284
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:286
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:291
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:293
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:295
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:297
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:305
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:307
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:316
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:319
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:321
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:324
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:326
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:329
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:331
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../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 "None"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:339 ../src/tooltips.py:409
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:341 ../src/tooltips.py:407
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:343 ../src/tooltips.py:405
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:382
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:384
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:386
 msgid "is composing a message..."
 msgstr "is composing a message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:389
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:391
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py: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
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: ../src/common/helpers.py:1121
-#, python-format
-msgid " from room %s"
+#: ../src/common/helpers.py:1083
+#, fuzzy, python-format
+msgid "from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
-#, python-format
-msgid " from user %s"
+#: ../src/common/helpers.py:1086 ../src/common/helpers.py:1103
+#, fuzzy, python-format
+msgid "from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1126
-#, python-format
-msgid " from %s"
+#: ../src/common/helpers.py:1088
+#, fuzzy, python-format
+msgid "from %s"
 msgstr " from %s"
 
-#: ../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] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: ../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
+msgid "Timeout loading image"
+msgstr "Timeout loading image"
+
+#: ../src/common/helpers.py:1452 ../src/common/helpers.py:1499
+msgid "Image is too big"
+msgstr "Image is too big"
+
+#: ../src/common/helpers.py:1463
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "CRL is not yet valid"
+
+#: ../src/common/helpers.py:1503
+#, fuzzy
+msgid "Error loading image"
+msgstr "Timeout loading image"
+
+#: ../src/common/jingle_rtp.py:115
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Room Configuration"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:116
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5503,115 +6096,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 "Error message: %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 "Error executing \"%(command)s\": %(error)s"
-
-#: ../src/common/logging_helpers.py:33
+#: ../src/common/logging_helpers.py:32
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:40
 #, fuzzy
-msgid " Default device"
+msgid "Default device"
 msgstr "Default Message"
 
 #. 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 "Size: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:82
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "File: %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py: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 "green"
+
+#. 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 "error: cannot open %s for reading"
+msgid "Error: cannot open %s for reading"
+msgstr "Error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:313 ../src/common/optparser.py:314
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:393
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
-#: ../src/common/passwords.py:123
+#: ../src/common/passwords.py:100
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP account %s@%s"
@@ -6244,19 +6851,115 @@ msgstr "Studying"
 msgid "Writing"
 msgstr "Writing"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "default"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "marine"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "Hiding"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "Country:"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "Account"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "Description"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "Error"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "one"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "room"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+msgid "street"
+msgstr ""
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:341
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:344
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:347
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:350
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6265,22 +6968,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6288,11 +6977,11 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6301,73 +6990,64 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py: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 "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:396
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Connection to host could not be established: Timeout while sending data."
 
-#: ../src/common/zeroconf/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 "Error while adding service. %s"
 
-#: ../src/config.py:397
-msgid "Default Message"
-msgstr "Default Message"
-
-#: ../src/config.py:406
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../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 "Default"
 
-#: ../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 "Dictionary for lang %s not available"
 
-#: ../src/config.py:734
+#: ../src/config.py:725
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6376,7 +7056,7 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1214
+#: ../src/config.py:1213
 msgid "status message title"
 msgstr "status message title"
 
@@ -6385,59 +7065,59 @@ msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../src/config.py: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 "Name"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1666
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1667
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1827 ../src/config.py:1962
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable on this computer"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:2007 ../src/config.py:2057
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1934
+#: ../src/config.py:2008
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:2038
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2039
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:2052 ../src/config.py:2628 ../src/config.py:2666
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2053
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1981
+#: ../src/config.py:2058
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1987
+#: ../src/config.py:2064
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2065
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6445,143 +7125,144 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2069 ../src/config.py:2074
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2070
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1997
+#: ../src/config.py:2075
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:2074
+#: ../src/config.py:2156
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2157
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2187
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2425 ../src/config.py:3768
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../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 "Custom port must be a port number."
 
-#: ../src/config.py:2342
+#: ../src/config.py:2448
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2449
 msgid "There is no OpenPGP secret key available."
 msgstr "There is no OpenPGP secret key available."
 
-#: ../src/config.py:2377
+#: ../src/config.py:2487
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2488
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2496
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2497
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../src/config.py: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 "You are not connected to the server"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2505
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2510
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2511
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2629 ../src/config.py:2667
 msgid "To disable the account, you must be disconnected."
 msgstr "To disable the account, you must be disconnected."
 
-#: ../src/config.py:2517
+#: ../src/config.py:2636
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2518
+#: ../src/config.py:2637
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2675
+#: ../src/config.py:2798
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2800
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2836
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2838
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py: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 "Reason"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2919
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2925
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2952
 msgid "Banning..."
 msgstr "Banning..."
 
 #. 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"
@@ -6589,11 +7270,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2956
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2957
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6601,11 +7282,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2959
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2960
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6613,11 +7294,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2962
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2963
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6625,7 +7306,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2964
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6641,110 +7322,106 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 
-#: ../src/config.py:2943
+#: ../src/config.py:3064
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3079
 #, fuzzy
 msgid "Account is disabled"
 msgstr "Emoticons disabled"
 
-#: ../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 "Password Required"
 
-#: ../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 "Enter your password for account %s"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:3095 ../src/gui_interface.py:748
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3105
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3106
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2999
+#: ../src/config.py:3120
 #, fuzzy, python-format
 msgid "Connection to server %s failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3121
 #, fuzzy
 msgid "What would you like to do?"
 msgstr "What do you want to do?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3122
 #, fuzzy
 msgid "Remove only from Gajim"
 msgstr "Remove account _only from 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 "All"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3219
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3220
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3280
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3316
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3317
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
-msgid "Invalid nickname"
-msgstr "Invalid nickname"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3440 ../src/config.py:3456 ../src/config.py:3467
+#: ../src/config.py:3495
 msgid "Character not allowed"
 msgstr "Character not allowed"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3455 ../src/config.py:3466 ../src/config.py:3744
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3494
 msgid "Invalid room"
 msgstr "Invalid room"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3658
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3659 ../src/config.py:3665
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6754,32 +7431,32 @@ msgstr ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3521
+#: ../src/config.py:3664
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3702
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3704
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3600
+#: ../src/config.py:3745
 msgid "Please provide a server on which you want to register."
 msgstr "Please provide a server on which you want to register."
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3801 ../src/gui_interface.py:1351
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../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 "This certificate is already in file %s, so it's not added again."
 
-#: ../src/config.py:3734
+#: ../src/config.py:3895
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6794,83 +7471,99 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
-#, python-format
+#: ../src/config.py:3901 ../src/gui_interface.py:1382
+#, fuzzy, 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 ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3934 ../src/config.py:3968
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3871
+#: ../src/config.py:4033
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3872
+#: ../src/config.py:4034
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3991
+#: ../src/config.py:4164
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/config.py:3992
+#: ../src/config.py:4165
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
-#: ../src/config.py:4036
-msgid "Active"
-msgstr "Active"
+#: ../src/config.py:4193
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "_Configure"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4218
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4252
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:4253
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4254
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4256
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4257
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4258
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4259
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4260
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4261
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4262
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:351
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+
+#: ../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"
@@ -6880,244 +7573,253 @@ msgstr ""
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 
-#: ../src/conversation_textview.py:620
-msgid ""
-"Text below this line is what has been said since the\n"
-"last time you paid attention to this group chat"
+#. show clear
+#: ../src/conversation_textview.py:761 ../src/profile_window.py:220
+msgid "_Clear"
 msgstr ""
-"Text below this line is what has been said since the\n"
-"last time you paid attention to this group chat"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:772
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:780
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:794
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:799
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../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 "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:830
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:833
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:839
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
+#: ../src/conversation_textview.py:1221
+#, fuzzy
+msgid "Invalid URL"
+msgstr "Invalid JID"
+
 #. %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] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1532 ../src/history_window.py:507
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:585
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:587
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibility not supported"
 
-#: ../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
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../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 "The Jabber ID you entered is already in the list. Choose another one."
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../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 "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:93
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Contact name: <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 "Group"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:216
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:309
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:314
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:492
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:613
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:627
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:817
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:818
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:826
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:827
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:855
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:856
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:857
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:858
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:859
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../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 "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:899
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1096 ../src/dialogs.py:1102 ../src/dialogs.py:1107
+#: ../src/dialogs.py:3814
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1103
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1108
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1122
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1123
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1176 ../src/dialogs.py:1210
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "A GTK+ jabber client"
+#: ../src/dialogs.py:1308
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "A GTK+ Jabber client"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1309
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1191
-msgid "PyGTK Version:"
+#: ../src/dialogs.py:1309
+#, fuzzy
+msgid "PyGobject Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1310
+msgid "python-nbxmpp Version:"
+msgstr ""
+
+#: ../src/dialogs.py:1321
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1323
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1329
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. 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 ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1347
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1531
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7130,101 +7832,158 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1876 ../src/dialogs.py:1892 ../src/gui_interface.py:1502
+#: ../src/gui_interface.py:1544
+msgid "Insecure connection"
+msgstr "Insecure connection"
+
+#: ../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 ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+
+#: ../src/dialogs.py:1883 ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1547
+msgid "Yes, I really want to connect insecurely"
+msgstr "Yes, I really want to connect insecurely"
+
+#: ../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 "Do _not ask me again"
+
+#: ../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 contains invalid characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2319
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %(account)s from %(jid)s"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2322
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %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 "You are already in group chat %s"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2413
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2459
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy
+msgid "Wrong server"
+msgstr "Wrong uri"
+
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "This is not a group chat"
+
+#: ../src/dialogs.py:2648
 msgid "Invalid Account"
 msgstr "Invalid Account"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2649
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "You have to choose an account from which you want to join the groupchat."
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2660
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../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 "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2666
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2672
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2677 ../src/gui_interface.py:2123
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../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 is not the name of a group chat."
+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
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2728
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2764
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2438
+#: ../src/dialogs.py:2765
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: ../src/dialogs.py:2462
+#: ../src/dialogs.py:2790
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2853
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../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:"
@@ -7232,169 +7991,144 @@ msgstr ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 
+#: ../src/dialogs.py:2856
+#, fuzzy
+msgid "Nickname / Jabber ID"
+msgstr "Duplicate 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 "Connection not available"
 
-#: ../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 "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2892 ../src/dialogs.py:2895
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2565
+#: ../src/dialogs.py:2895
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2904
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2924
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2928
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2929
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "Contact Signed In"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "Contact Signed Out"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "New Message"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "New Single Message"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "New Private Message"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2974 ../src/gui_interface.py:898 ../src/notify.py:287
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../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 "File Transfer Request"
 
-#: ../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 "File Transfer Error"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py: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 "File Transfer Completed"
 
-#: ../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 "File Transfer Stopped"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
-msgid "Groupchat Invitation"
-msgstr "Groupchat Invitation"
-
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "Contact Changed Status"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3190
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:3192
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3194
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:3197
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3220
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
+#: ../src/dialogs.py:3243
 #, python-format
 msgid "Form %s"
 msgstr "Form %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py: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 wrote:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3387
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3389
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "add"
 msgstr "Sad"
 
-#: ../src/dialogs.py:3175
+#: ../src/dialogs.py:3522
 #, fuzzy
 msgid "modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3523
 #, fuzzy
 msgid "remove"
 msgstr "Remo_ve"
 
-#: ../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 "
@@ -7402,188 +8136,207 @@ msgid ""
 msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
-msgid "Add"
-msgstr "Add"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3570 ../src/dialogs.py:3645
 msgid "Modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3228
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3582
 msgid "Groups"
 msgstr "Groups"
 
 #. it is selected
-#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
+#. remote_jid = model[iter_][1]
+#: ../src/dialogs.py:3690
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s suggested me to add you in my roster."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3704
 #, fuzzy, python-format
-msgid "Added  %s contacts"
-msgstr "_Add contact"
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "_Add contact"
+msgstr[1] "_Add contact"
 
-#: ../src/dialogs.py:3393
+#: ../src/dialogs.py:3742
 #, fuzzy, python-format
-msgid "Removed  %s contacts"
-msgstr "Removes contact from roster"
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "Removes contact from roster"
+msgstr[1] "Removes contact from roster"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py: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 "Invalid Server Name"
 
-#: ../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
 #, fuzzy
 msgid "There is an error"
 msgstr "Service returned an error."
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:4165
+msgid "Success!"
+msgstr ""
+
+#: ../src/dialogs.py:4165
+#, fuzzy
+msgid "Your Archiving Preferences have been saved!"
+msgstr "_Preferences"
+
+#: ../src/dialogs.py:4181
+msgid "We got no response from the Server"
+msgstr ""
+
+#: ../src/dialogs.py:4183
+#, fuzzy
+msgid "We received an error: {}"
+msgstr "Service returned an error."
+
+#: ../src/dialogs.py:4187
+#, fuzzy
+msgid "Error!"
+msgstr "Error"
+
+#: ../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 "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:4323
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4392
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4397
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4451
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4563
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4664
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4666
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4756
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4757
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4793
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:4224
+#: ../src/dialogs.py:4796
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4798
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4807
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4809
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../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 "All files"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4893
 msgid "PKCS12 Files"
 msgstr ""
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4919
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4935
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4965
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4983
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:4482
+#: ../src/dialogs.py:5053
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:4500
+#: ../src/dialogs.py:5072
 #, fuzzy
 msgid "Zip files"
 msgstr "All files"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:5098
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:5100
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "Condition"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr "when I am "
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:5322
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7594,19 +8347,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:5325
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:5331 ../src/dialogs.py:5416
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:5337
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../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 "
@@ -7616,19 +8369,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:5345 ../src/dialogs.py:5397 ../src/dialogs.py:5410
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:5350
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:5361
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../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> "
@@ -7643,83 +8396,138 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5363
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Did you talk to the remote contact and verify the SAS?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5398
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 
-#: ../src/dialogs.py:5279
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5404
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5411
+#, fuzzy
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5417
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py: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 "for account %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 "SSL certificate error"
+
+#: ../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 "This service has not yet responded with detailed information"
+
+#: ../src/disco.py:69
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+
+#: ../src/disco.py:128
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:132
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:530
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:616
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:618
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:779
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../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."
@@ -7727,98 +8535,106 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:786 ../src/disco.py:1138
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:787
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:828 ../src/disco.py:838
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:896
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:912
-msgid "_Browse"
+#: ../src/disco.py:943
+#, fuzzy
+msgid "Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1139
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1341
-msgid "_Execute Command"
+#: ../src/disco.py:1351
+#, fuzzy
+msgid "Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1355 ../src/disco.py:1520
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1366
+#, fuzzy
+msgid "Join"
+msgstr "_Join"
+
+#: ../src/disco.py:1561
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1757
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1765
 msgid "Description"
 msgstr "Description"
 
 #. 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 "Bookmark already set"
 
-#: ../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 "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../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 "Bookmark has been added successfully"
 
-#: ../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 "You can manage your bookmarks via Actions menu in your roster."
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2044
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2053
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2120
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2126
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2132
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
 #: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
 #: ../src/features_window.py:50
@@ -7828,7 +8644,8 @@ msgstr ""
 "A library used to validate server certificates to ensure a secure connection."
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "Requires python-pyopenssl."
 
 #: ../src/features_window.py:53
@@ -7844,8 +8661,10 @@ msgid "Requires python-avahi."
 msgstr "Requires python-avahi."
 
 #: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
 
 #: ../src/features_window.py:57
 msgid "Command line"
@@ -7859,24 +8678,30 @@ msgstr "A script to control Gajim via commandline."
 msgid "Requires python-dbus."
 msgstr "Requires python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../src/features_window.py: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 "Feature not available under Windows."
 
 #: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenGPG message encryption"
 
 #: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "Encrypting chat messages with gpg keys."
 
 #: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "Requires gpg and python-GnuPGInterface."
+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
 msgid "Network-manager"
@@ -7891,66 +8716,44 @@ msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requires gnome-network-manager and python-dbus."
 
 #: ../src/features_window.py:69
-msgid "Session Management"
-msgstr "Session Management"
-
-#: ../src/features_window.py:70
-msgid "Gajim session is stored on logout and restored on login."
-msgstr "Gajim session is stored on logout and restored on login."
-
-#: ../src/features_window.py:71
-msgid "Requires python-gnome2."
-msgstr "Requires python-gnome2."
-
-#: ../src/features_window.py:73
 msgid "Password encryption"
 msgstr "Password encryption"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwords can be stored securely and not just in plaintext."
 
-#: ../src/features_window.py:75
-msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-
-#: ../src/features_window.py:77
-msgid "SRV"
-msgstr "SRV"
-
-#: ../src/features_window.py:78
-msgid "Ability to connect to servers which are using SRV records."
-msgstr "Ability to connect to servers which are using SRV records."
-
-#: ../src/features_window.py:79
-msgid "Requires dnsutils."
-msgstr "Requires dnsutils."
-
-#: ../src/features_window.py:80
-msgid "Requires nslookup to use SRV records."
-msgstr "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 "Spell Checker"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:74
 msgid "Spellchecking of composed messages."
 msgstr "Spellchecking of composed messages."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:75
 msgid "Requires libgtkspell."
 msgstr "Requires libgtkspell."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:76
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "Requires libgtkspell."
+
+#: ../src/features_window.py:77
 msgid "Notification"
 msgstr "Notification"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:78
 msgid "Passive popups notifying for new events."
 msgstr "Passive popups notifying for new events."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:79
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7958,65 +8761,39 @@ msgstr ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:81
 msgid "Automatic status"
 msgstr "Automatic status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:82
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Ability to measure idle time, in order to set auto status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:83
 msgid "Requires libxss library."
 msgstr "Requires libxss library."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:84
 msgid "Requires python2.5."
 msgstr "Requires python2.5."
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Transform LaTeX expressions between $$ $$."
-
-#: ../src/features_window.py:95
-#, fuzzy
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
-
-#: ../src/features_window.py:96
-#, fuzzy
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
-"You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-
-#: ../src/features_window.py:97
+#: ../src/features_window.py:85
 msgid "End to End message encryption"
 msgstr "End to End message encryption"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:86
 msgid "Encrypting chat messages."
 msgstr "Encrypting chat messages."
 
-#: ../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 "Requires python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:89
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../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)."
@@ -8024,140 +8801,139 @@ msgstr ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:91 ../src/features_window.py:92
 msgid "Requires python-docutils."
 msgstr "Requires python-docutils."
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:94
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../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
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "Requires python-avahi."
+msgid "Requires python-gupnp-igd."
+msgstr "Requires python-gnome2."
+
+#: ../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
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "Requires python-dbus."
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:111
 #, fuzzy
 msgid "?features:Available"
 msgstr "Available"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:118
 msgid "Feature"
 msgstr "Feature"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:85
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:100
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:112
 msgid "Progress"
 msgstr "Progress"
 
-#: ../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 "Filename: %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 "Size: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:197 ../src/filetransfers_window.py:207
+#: ../src/history_manager.py:550
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:199 ../src/filetransfers_window.py:731
+#: ../src/tooltips.py:845
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:210
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "File transfer completed"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "File transfer cancelled"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "File transfer stopped"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:311
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:328 ../src/tooltips.py:880
 msgid "Description: "
 msgstr "Description: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:341
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:342
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "File: %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "Type: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "Description: %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s wants to send you a file:"
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:386 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:387 ../src/gtkgui_helpers.py:785
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -8165,33 +8941,64 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../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 "What do you want to do?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:918
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:415 ../src/gtkgui_helpers.py:796
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:416 ../src/gtkgui_helpers.py:797
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:427
 msgid "Save File as..."
 msgstr "Save File as..."
 
+#: ../src/filetransfers_window.py:447
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:453
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:455
+#, python-format
+msgid "Description: %s"
+msgstr "Description: %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s wants to send you a file:"
+
+#: ../src/filetransfers_window.py:497
+#, fuzzy
+msgid "Checking file..."
+msgstr "Sending profile..."
+
+#: ../src/filetransfers_window.py:511
+#, fuzzy
+msgid "File error"
+msgstr "File Transfer Error"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:548
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8199,112 +9006,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 "Invalid File"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:697
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:701
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:727 ../src/tooltips.py:836
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:729 ../src/tooltips.py:839
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:896
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:142
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim needs X server to run. Quiting..."
-
-#: ../src/gajim.py:144
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "importing PyGTK failed: %s"
-
-#: ../src/gajim.py:186
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim needs PyGTK 2.12 or above"
-
-#: ../src/gajim.py:187
-#, fuzzy
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-
-#: ../src/gajim.py:189
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim needs GTK 2.12 or above"
-
-#: ../src/gajim.py:190
-#, fuzzy
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
-
-#: ../src/gajim.py:199
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim needs pywin32 to run"
-
-#: ../src/gajim.py:200
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:316
-msgid "Gajim is already running"
-msgstr "Gajim is already running"
-
-#: ../src/gajim.py:317
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
+#: ../src/filetransfers_window.py:907
+msgid "_Continue"
+msgstr "_Continue"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8312,51 +9068,55 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py: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 "account"
 
-#: ../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 "show only contacts of the given account"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:111
+#, fuzzy
+msgid "?CLI:status"
 msgstr "status"
 
-#: ../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 "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../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 "message"
+
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "status message"
 
-#: ../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"
@@ -8364,20 +9124,44 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:119
+msgid "Changes the priority of account or accounts"
+msgstr "Changes the priority of account or accounts"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priority"
+
+#: ../src/gajim-remote.py:121
+msgid "priority you want to give to the account"
+msgstr "priority you want to give to the account"
+
+#: ../src/gajim-remote.py:123
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+
+#: ../src/gajim-remote.py:129
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:131
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:223
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:136
+msgid "message content. The account must be specified or \"\""
+msgstr "message content. The account must be specified or \"\""
+
+#: ../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 "
@@ -8387,34 +9171,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py: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 "
@@ -8424,133 +9203,130 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "message subject"
 msgstr "message subject"
 
-#: ../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 "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:170
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:177
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:183
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:185
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:189
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "File path"
 msgstr "File path"
 
-#: ../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 "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:202
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "key=value"
 msgstr "key=value"
 
-#: ../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 "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "key"
 msgstr "key"
 
-#: ../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 "name of the preference to be deleted"
 
-#: ../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 "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:229
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:232
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:237
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py: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 ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:251
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:255
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:257
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:263
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../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"
@@ -8558,44 +9334,94 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Change status"
+
+#: ../src/gajim-remote.py:272
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nickname to use"
+
+#: ../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 ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
 msgid "Handle a xmpp:/ uri"
-msgstr "Handle a xmpp:/ uri"
+msgstr "Handle a xmpp: uri"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:281
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "URI to handle"
+msgstr "URI to handle"
+
+#: ../src/gajim-remote.py:282
+msgid "Account in which you want to handle it"
+msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:284
+msgid "Message content"
+msgstr "Message content"
+
+#: ../src/gajim-remote.py:288
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:room"
 msgstr "room"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+msgid "Room JID"
+msgstr "Room JID"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "nick"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+msgid "Nickname to use"
+msgstr "Nickname to use"
+
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:password"
 msgstr "password"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:292
+msgid "Password to enter the room"
+msgstr "Password to enter the room"
+
+#: ../src/gajim-remote.py:293
+msgid "Account from which you want to enter the room"
+msgstr "Account from which you want to enter the room"
+
+#: ../src/gajim-remote.py:298
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:302
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:330
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:352
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8604,157 +9430,44 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:355
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:402
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:429
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:433
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:437
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:443
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Too many arguments. \n"
-"Type \"%(basename)s help %(command)s\" for more info"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"Argument \"%(arg)s\" is not specified. \n"
-"Type \"%(basename)s help %(command)s\" for more info"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "Wrong uri"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "Changes the priority of account or accounts"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "priority"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "priority you want to give to the account"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "message content. The account must be specified or \"\""
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"Returns current status message (the global one unless account is specified)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "Change status"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "Nickname to use"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "URI to handle"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "Account in which you want to handle it"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "Message content"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "Room JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "Nickname to use"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "Password to enter the room"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "Account from which you want to enter the room"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-msgstr ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:513
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8763,7 +9476,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:518
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8772,206 +9485,246 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:537
 msgid "No uri given"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim-remote.py:539
+msgid "Wrong uri"
+msgstr "Wrong uri"
+
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Theme"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 msgid "You cannot make changes to the default theme"
 msgstr "You cannot make changes to the default theme"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr "Please create a clean new theme with your desired name."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "theme name"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
-#: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#: ../src/gajim_themes_window.py:188
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:189 ../src/groupchat_control.py:1699
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s is now known as %(new_nick)s"
+
+#: ../src/groupchat_control.py:244
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:246
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: ../src/groupchat_control.py:455
+#: ../src/groupchat_control.py:637
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:636
+#: ../src/groupchat_control.py:827
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:638
+#: ../src/groupchat_control.py:829
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
+#: ../src/groupchat_control.py:1311
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)s has set the subject to %(subject)s"
+
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1329 ../src/groupchat_control.py:1641
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
+#: ../src/groupchat_control.py:1332
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "Room now shows unavailable member"
+
+#: ../src/groupchat_control.py:1334
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "room now does not show unavailable members"
+
+#: ../src/groupchat_control.py:1336
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "A non-privacy-related room configuration change has occurred"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1340
+msgid "Room logging is now enabled"
+msgstr "Room logging is now enabled"
+
+#: ../src/groupchat_control.py:1342
+msgid "Room logging is now disabled"
+msgstr "Room logging is now disabled"
+
+#: ../src/groupchat_control.py:1344
+msgid "Room is now non-anonymous"
+msgstr "Room is now non-anonymous"
+
+#: ../src/groupchat_control.py:1347
+msgid "Room is now semi-anonymous"
+msgstr "Room is now semi-anonymous"
+
+#: ../src/groupchat_control.py:1350
+msgid "Room is now fully-anonymous"
+msgstr "Room is now fully-anonymous"
+
+#: ../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 has been removed from the room (%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1646
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1648
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1651
 msgid "The server has assigned or modified your roomnick"
 msgstr "The server has assigned or modified your roomnick"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1657
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1672
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1683 ../src/groupchat_control.py:1799
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s is now known as %(new_nick)s"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1753 ../src/groupchat_control.py:1758
+#: ../src/groupchat_control.py:1764
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1755
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1760
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1766
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../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 ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1872
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1902
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1907
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s is now %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2181
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2183
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
-msgid "_Do not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2222
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2223
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2235
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2236
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
+#: ../src/groupchat_control.py:2261
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2267
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %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:"
@@ -8979,199 +9732,155 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2270
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2452
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %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 "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2733
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
 
-#: ../src/gtkexcepthook.py:46
-msgid "A programming error has been detected"
-msgstr "A programming error has been detected"
-
-#: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr ""
-"It is probably not fatal, but should be reported to the developers "
-"nonetheless."
-
-#: ../src/gtkexcepthook.py:54
-msgid "_Report Bug"
-msgstr "_Report Bug"
-
-#: ../src/gtkexcepthook.py:76
-msgid "Details"
-msgstr "Details"
-
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "Error: cannot open %s for reading"
-
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:392
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:395
 msgid "Error parsing file:"
 msgstr "Error parsing file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:436
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Could not write to %s. Session Management support will not work"
 
-#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
-msgid "Gajim is not the default Jabber client"
-msgstr "Gajim is not the default Jabber client"
-
-#: ../src/gtkgui_helpers.py:823
-msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "Would you like to make Gajim the default Jabber client?"
-
-#: ../src/gtkgui_helpers.py:824
-msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Always check to see if Gajim is the default Jabber client on startup"
-
-#: ../src/gtkgui_helpers.py:891
+#: ../src/gtkgui_helpers.py:770
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../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 "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:928
+#: ../src/gtkgui_helpers.py:806
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../src/gui_interface.py: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 "Unable to join group chat"
 
 #: ../src/gui_interface.py:138
-#, python-format
+#, 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 ""
 "Your desired nickname in group chat %s is in use or registered by another "
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:159
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:161
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gui_interface.py:163
+#: ../src/gui_interface.py:164
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:207 ../src/notify.py:293
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:291
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: ../src/gui_interface.py:324
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#: ../src/gui_interface.py:306
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "Maximum number of users for %s has been reached"
 
-#: ../src/gui_interface.py:333
-#, python-format
-msgid "You are banned from group chat %s."
+#: ../src/gui_interface.py:315
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "You are banned from group chat %s."
 
-#: ../src/gui_interface.py:338
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:321
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:324
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/gui_interface.py:344
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:327
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:332
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:426 ../src/gui_interface.py:430
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "error while sending %(message)s ( %(error)s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:482 ../src/notify.py:295
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:507
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../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 "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:516
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:517
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9179,107 +9888,94 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:539 ../src/notify.py:297
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: ../src/gui_interface.py:631
+#: ../src/gui_interface.py:550
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:643
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s has set the subject to %(subject)s"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr "Room now shows unavailable member"
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr "room now does not show unavailable members"
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "A non-privacy-related room configuration change has occurred"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "Room logging is now enabled"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "Room logging is now disabled"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "Room is now non-anonymous"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "Room is now semi-anonymous"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "Room is now fully-anonymous"
+#: ../src/gui_interface.py:647
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:677
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:680 ../src/gui_interface.py:688
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:682
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:993
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:687
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenGPG Passphrase Incorrect"
 
-#: ../src/gui_interface.py:1019
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:700
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "Certificate has expired"
+
+#: ../src/gui_interface.py:701
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+
+#: ../src/gui_interface.py:723
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG key not trusted"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:723
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 
-#: ../src/gui_interface.py:1031
-#, 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 ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:873
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gui_interface.py:1146
+#: ../src/gui_interface.py:886
 #, python-format
 msgid ""
 "\n"
@@ -9294,80 +9990,69 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "Remote contact stopped transfer"
+#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1424
+msgid "SSL certificate error"
+msgstr "SSL certificate error"
 
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "Error opening file"
+#: ../src/gui_interface.py:1065
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "File Transfers"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:1091
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gui_interface.py:1304
+#. ft hash error
+#: ../src/gui_interface.py:1095
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gui_interface.py:1108
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:1112
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
+#. ft hash error
+#: ../src/gui_interface.py:1116
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1199
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1211
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1212
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "Error."
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1227
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../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"
@@ -9376,21 +10061,21 @@ msgstr ""
 "type a new one"
 
 #. 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 wants to send you a file."
 
-#: ../src/gui_interface.py:1607
+#: ../src/gui_interface.py:1288
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1377
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../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: "
@@ -9401,21 +10086,25 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1388
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gui_interface.py:1745
-msgid "SSL certificate error"
-msgstr "SSL certificate error"
+#: ../src/gui_interface.py:1401
+msgid "Non Anonymous Server"
+msgstr ""
 
-#: ../src/gui_interface.py:1746
-#, python-format
+#: ../src/gui_interface.py:1425
+#, fuzzy, 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 ""
@@ -9426,27 +10115,7 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
-msgid "Insecure connection"
-msgstr "Insecure connection"
-
-#: ../src/gui_interface.py:1777
-#, fuzzy
-msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
-msgstr ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
-msgid "Yes, I really want to connect insecurely"
-msgstr "Yes, I really want to connect insecurely"
-
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py: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?"
@@ -9454,7 +10123,7 @@ msgstr ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
-#: ../src/gui_interface.py:1850
+#: ../src/gui_interface.py:1545
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -9464,11 +10133,12 @@ msgstr ""
 "sure you want to do that?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:2070 ../src/gui_interface.py:2077
+#: ../src/gui_interface.py:2101
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:2071
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9476,7 +10146,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../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 "
@@ -9486,83 +10156,110 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:2150 ../src/roster_window.py:3832
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2871
+#: ../src/gui_interface.py:2506
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:3105
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3412
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3106
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3426
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3120
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG key expired"
 
-#: ../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 "Your GPG key has expied, you will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:3130
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../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 "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:96
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:461
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
-#: ../src/history_manager.py:114
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:582
+msgid "_Manage Transport"
+msgstr "_Manage Transport"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:588
+msgid "_Modify Transport"
+msgstr "_Modify Transport"
+
+#: ../src/history_manager.py:76
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Options:"
+msgstr "_Emoticons:"
+
+#: ../src/history_manager.py:80
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/history_manager.py:81
+#, fuzzy
+msgid "Set logs directory"
+msgstr "creating %s directory"
+
+#: ../src/history_manager.py:128
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "Contacts"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:181 ../src/history_manager.py:225
+#: ../src/history_window.py:102
 msgid "Date"
 msgstr "Date"
 
 #. 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 "Nickname"
 
 #. 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 "Message"
 
 #. 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 "Subject"
 
-#: ../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)"
@@ -9570,7 +10267,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py: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 "
@@ -9584,93 +10281,108 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:271
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "Database Error"
+
+#: ../src/history_manager.py:486
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../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 on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py:572
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "Do you really want to delete the logs of the selected contact?"
-msgstr[1] "Do you really want to delete the logs of the selected contacts?"
+#: ../src/history_manager.py:600
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "Do you really want to delete the selected message?"
+
+#: ../src/history_manager.py:604
+#, fuzzy
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "Do you really want to delete the logs of the selected contact?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:606 ../src/history_manager.py:645
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "Cancel confirmation"
+
+#: ../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] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:319
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:369
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: ../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 is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:479
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:481
 msgid "Error"
 msgstr "Error"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:483
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:486
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "Timeout loading image"
+#: ../src/htmltextview.py:559
+#, fuzzy
+msgid "Loading"
+msgstr "Coding"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "Image is too big"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:238
 msgid "You are going to close several tabs"
 msgstr "You are going to close several tabs"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:239
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:529
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:531
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:533
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:539
 msgid "Messages"
 msgstr "Messages"
 
@@ -9682,100 +10394,112 @@ msgstr "- messages will be logged"
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Changed Status"
+#: ../src/notify.py:335
+msgid "Ignore"
+msgstr "Ignore"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Signed In"
+#: ../src/plugins/gui.py:81
+msgid "Plugin"
+msgstr ""
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Signed Out"
+#: ../src/plugins/gui.py:150
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "Banning %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "New Single Message from %(nickname)s"
+#: ../src/plugins/gui.py:207
+#, fuzzy
+msgid "Plugin failed"
+msgstr "Registration failed"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "New Private Message from group chat %s"
+#: ../src/plugins/gui.py: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
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "Service sent malformed data"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "Messaged by %(nickname)s"
+#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/pluginmanager.py:582
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "This file already exists"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "New Message from %(nickname)s"
+#: ../src/plugins/gui.py:284
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "Ignore"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "Room Configuration"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:552 ../src/plugins/pluginmanager.py:558
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:554
+#, fuzzy
+msgid "Archive empty"
+msgstr "File is empty"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:63
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:132 ../src/roster_window.py:3131
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:135 ../src/roster_window.py:3134
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:149 ../src/profile_window.py:166
+#: ../src/roster_window.py:3136 ../src/roster_window.py:3147
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:239
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Personal Information"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:240
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:298
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:376
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:389
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:408
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:415
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:416
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9783,51 +10507,52 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
+#: ../src/roster_window.py:258 ../src/roster_window.py:1059
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2070
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2071
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2094
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../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 "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2109
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2110
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2137
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2138
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2345 ../src/roster_window.py:3762
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py: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?"
@@ -9835,38 +10560,38 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2373
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2438
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2439
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2440
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2527
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancel file transfer"
 
-#: ../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 "You have unread messages"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2560
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9874,16 +10599,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2918
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2921
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../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."
@@ -9891,11 +10616,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2925
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2930
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9904,11 +10629,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2981
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "You are about to block a contact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2983
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9917,56 +10642,56 @@ msgstr ""
 "send you."
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3023
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3024
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3031
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3032
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3077
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3078
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3079
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3118
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3119
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3573
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3575
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: ../src/roster_window.py:3379
+#: ../src/roster_window.py:3580
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9975,11 +10700,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3586
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../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."
@@ -9987,16 +10712,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3593
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3597
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3602
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10005,14 +10730,14 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3459
+#: ../src/roster_window.py: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 ""
 "You are about to send a custom status. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3461
+#: ../src/roster_window.py:3662
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10021,33 +10746,34 @@ msgstr ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3681
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3682
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4391
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py: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 ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:4189
+#: ../src/roster_window.py:4489
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py: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 "
@@ -10057,190 +10783,143 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4613
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4318
+#: ../src/roster_window.py:4625
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: ../src/roster_window.py:4433
+#: ../src/roster_window.py:4764
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:4777
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "Make %s and %s metacontacts"
+
+#: ../src/roster_window.py:4782
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#. 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 "using account %s"
 
-#. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5320
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
-#. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5327
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5366 ../src/statusicon.py:335
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
-#. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5384
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5426
 #, python-format
 msgid "for account %s"
 msgstr "for account %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 "_Change Status Message"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5510
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5176
+#: ../src/roster_window.py:5512
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5516
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5657
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: ../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 "Send Group M_essage"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5671
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5675
 msgid "To all online users"
 msgstr "To all online users"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5842
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
-#. Edit Groups
-#: ../src/roster_window.py:5537
-msgid "Edit _Groups"
-msgstr "Edit _Groups"
-
-#. Send single message
-#: ../src/roster_window.py:5592
-msgid "Send Single Message"
-msgstr "Send Single Message"
-
-#. Execute Command
-#: ../src/roster_window.py:5639
-msgid "Execute Command..."
-msgstr "Execute Command..."
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:5649
-msgid "_Manage Transport"
-msgstr "_Manage Transport"
-
-#. Modify Transport
-#: ../src/roster_window.py:5658
-msgid "_Modify Transport"
-msgstr "_Modify Transport"
-
-#. Rename
-#: ../src/roster_window.py:5668
-msgid "_Rename"
-msgstr "_Rename"
-
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5914
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: ../src/roster_window.py:5744
-msgid "_Disconnect"
-msgstr "_Disconnect"
-
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6004
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6012
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6299
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:108
 msgid "Waiting for results"
 msgstr "Waiting for results"
 
-#: ../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 "Error in received dataform"
 
 #. 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 "No result"
 
-#: ../src/session.py:136
-msgid "Disk WriteError"
-msgstr "Disk WriteError"
-
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "Subject: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:429 ../src/session.py:489
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:448
+#: ../src/session.py:431
 #, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -10252,7 +10931,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:492
+#: ../src/session.py:491
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -10267,180 +10946,126 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:494
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/statusicon.py:235
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:348
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in _roster"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:360
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../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 "Resource: "
-
-#: ../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 of this group chat"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:565
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:569
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:768
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:770
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:787
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:789
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
-msgid "Subscription: "
-msgstr "Subscription: "
-
-#: ../src/tooltips.py:625
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:646
-#, fuzzy, python-format
-msgid "Idle since %s"
-msgstr " since %s"
-
-#: ../src/tooltips.py:647
-#, fuzzy, python-format
-msgid "Idle for %s"
-msgstr "XML Console for %s"
-
-#: ../src/tooltips.py:698
-#, fuzzy, python-format
-msgid "Mood: %s"
-msgstr "Mood:"
-
-#: ../src/tooltips.py:702
-#, fuzzy, python-format
-msgid "Activity: %s"
-msgstr "Activity:"
-
-#: ../src/tooltips.py:706
-#, fuzzy, python-format
-msgid "Tune: %s"
-msgstr "Tune:"
-
-#: ../src/tooltips.py:710
-#, fuzzy, python-format
-msgid "Location: %s"
-msgstr "Notification"
-
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:838
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:844
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:851
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:857
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:860 ../src/tooltips.py:877
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:862
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:864 ../src/tooltips.py:867
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:870
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:873
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:875
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:812
-msgid "This service has not yet responded with detailed information"
-msgstr "This service has not yet responded with detailed information"
-
-#: ../src/tooltips.py:815
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
-msgstr ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
+#: ../src/tooltips.py:878
+msgid "Status: "
+msgstr "Status: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:328 ../src/vcard.py:335
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:332 ../src/vcard.py:337
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:366 ../src/vcard.py:369
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: ../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 "since %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
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</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"
@@ -10448,7 +11073,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:443
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10456,13 +11081,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:445
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:447
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10470,18 +11095,627 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:454
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:456
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:461 ../src/vcard.py:515 ../src/vcard.py:637
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "Error description..."
+#~ msgstr "Error description..."
+
+#, fuzzy
+#~ msgid "View contact information (Ctrl+I)"
+#~ msgstr "Invite contacts to the conversation (Ctrl+G)"
+
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "(<b>ESession</b> info)"
+
+#, fuzzy
+#~ msgid "Enter JID or Contact name"
+#~ msgstr "Contact name"
+
+#, fuzzy
+#~ msgid "Groupchat Histories"
+#~ msgstr "Groupchats"
+
+#, fuzzy
+#~ msgid "All Chat Histories"
+#~ msgstr "Old stories"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+
+#~ msgid "More"
+#~ msgstr "More"
+
+#~ msgid "Ping?"
+#~ msgstr "Ping?"
+
+#~ msgid "Error."
+#~ msgstr "Error."
+
+#~ msgid "A connection is not available"
+#~ msgstr "A connection is not available"
+
+#~ msgid "Your message can not be sent until you are connected."
+#~ msgstr "Your message can not be sent until you are connected."
+
+#~ msgid "Really send file?"
+#~ msgstr "Really send file?"
+
+#~ msgid "If you send a file to %s, he/she will know your real Jabber ID."
+#~ msgstr "If you send a file to %s, he/she will know your real Jabber ID."
+
+#~ msgid "creating %s directory"
+#~ msgstr "creating %s directory"
+
+#~ msgid ""
+#~ "If True, Gajim will use Gnome Keyring (if available) to store account "
+#~ "passwords."
+#~ msgstr ""
+#~ "If True, Gajim will use Gnome Keyring (if available) to store account "
+#~ "passwords."
+
+#~ msgid ""
+#~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+#~ "account passwords."
+#~ msgstr ""
+#~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+#~ "account passwords."
+
+#, fuzzy
+#~ msgid "Please check if avahi/bonjour-daemon is running."
+#~ msgstr "Please check if avahi-daemon is running."
+
+#~ msgid "%s is not the name of a group chat."
+#~ msgstr "%s is not the name of a group chat."
+
+#~ msgid "Session Management"
+#~ msgstr "Session Management"
+
+#~ msgid "Gajim session is stored on logout and restored on login."
+#~ msgstr "Gajim session is stored on logout and restored on login."
+
+#~ msgid "Requires python-gnome2."
+#~ msgstr "Requires python-gnome2."
+
+#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
+#~ msgstr "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
+
+#~ msgid "SRV"
+#~ msgstr "SRV"
+
+#~ msgid "Ability to connect to servers which are using SRV records."
+#~ msgstr "Ability to connect to servers which are using SRV records."
+
+#~ msgid "Requires dnsutils."
+#~ msgstr "Requires dnsutils."
+
+#~ msgid "Requires nslookup to use SRV records."
+#~ msgstr "Requires nslookup to use SRV records."
+
+#~ msgid "Gajim needs X server to run. Quiting..."
+#~ msgstr "Gajim needs X server to run. Quiting..."
+
+#~ msgid "importing PyGTK failed: %s"
+#~ msgstr "importing PyGTK failed: %s"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above"
+#~ msgstr "Gajim needs PyGTK 2.12 or above"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above"
+#~ msgstr "Gajim needs GTK 2.12 or above"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
+
+#~ msgid "Gajim needs pywin32 to run"
+#~ msgstr "Gajim needs pywin32 to run"
+
+#~ msgid ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+#~ msgstr ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+
+#~ msgid "Gajim is already running"
+#~ msgstr "Gajim is already running"
+
+#~ msgid ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+#~ msgstr ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+
+#~ msgid "A programming error has been detected"
+#~ msgstr "A programming error has been detected"
+
+#~ msgid ""
+#~ "It probably is not fatal, but should be reported to the developers "
+#~ "nonetheless."
+#~ msgstr ""
+#~ "It is probably not fatal, but should be reported to the developers "
+#~ "nonetheless."
+
+#~ msgid "_Report Bug"
+#~ msgstr "_Report Bug"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#, fuzzy
+#~ msgid ""
+#~ "Gnome Keyring is installed but not correctly started (environment "
+#~ "variable probably not correctly set)"
+#~ msgstr ""
+#~ "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+#~ "variable probably not \t\t\t\tcorrectly set)"
+
+#~ msgid "Jabber ID: "
+#~ msgstr "Jabber ID: "
+
+#~ msgid "Resource: "
+#~ msgstr "Resource: "
+
+#~ msgid "Subscription: "
+#~ msgstr "Subscription: "
+
+#, fuzzy
+#~ msgid "Mood: "
+#~ msgstr "Mood:"
+
+#, fuzzy
+#~ msgid "Activity: "
+#~ msgstr "Activity:"
+
+#, fuzzy
+#~ msgid "Gajim Remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Join _Group Chat..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modify Account"
+
+#~ msgid "Check on startup if Gajim is the _default Jabber client"
+#~ msgstr "Check on startup if Gajim is the _default Jabber client"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Group Chat"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Send Single _Message"
+
+#~ msgid ""
+#~ "If True, Gajim will check if it's the default jabber client on each "
+#~ "startup."
+#~ msgstr ""
+#~ "If True, Gajim will check if it's the default jabber client on each "
+#~ "startup."
+
+#, fuzzy
+#~ msgid "Certificate"
+#~ msgstr "Self signed certificate"
+
+#~ msgid "Gajim is not the default Jabber client"
+#~ msgstr "Gajim is not the default Jabber client"
+
+#~ msgid "Would you like to make Gajim the default Jabber client?"
+#~ msgstr "Would you like to make Gajim the default Jabber client?"
+
+#~ msgid "Always check to see if Gajim is the default Jabber client on startup"
+#~ msgstr ""
+#~ "Always check to see if Gajim is the default Jabber client on startup"
+
+#~ msgid "Edit _Groups"
+#~ msgstr "Edit _Groups"
+
+#~ msgid "Send Single Message"
+#~ msgstr "Send Single Message"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Execute Command..."
+
+#~ msgid "_Rename"
+#~ msgstr "_Rename"
+
+#, fuzzy
+#~ msgid "Choose Client Cert"
+#~ msgstr "Choose File to Send..."
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr " a window/tab opened with that contact "
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Actions</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>Conditions</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "Advanced Actions"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "Advanced Notifications Control"
+
+#~ msgid "All statuses"
+#~ msgstr "All statuses"
+
+#~ msgid "Busy "
+#~ msgstr "Busy "
+
+#, fuzzy
+#~ msgid "Contact Change Status "
+#~ msgstr "Contact Changed Status"
+
+#, fuzzy
+#~ msgid "Contact Disconnected "
+#~ msgstr "Contact Disconnected"
+
+#~ msgid "Don't have "
+#~ msgstr "Don't have "
+
+#, fuzzy
+#~ msgid "File Transfer Started "
+#~ msgstr "File Transfer Stopped"
+
+#, fuzzy
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "Group Chat Message Highlight"
+
+#, fuzzy
+#~ msgid "Group Chat Message Received "
+#~ msgstr "Group Chat Message Received"
+
+#~ msgid "Launch a command"
+#~ msgstr "Launch a command"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "One or more special statuses..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "Online / Free For Chat"
+
+#~ msgid "Play a sound"
+#~ msgstr "Play a sound"
+
+#, fuzzy
+#~ msgid "Receive a Message"
+#~ msgstr "New Private Message"
+
+#~ msgid "When "
+#~ msgstr "When "
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "_Disable auto opening chat window"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "_Disable existing pop-up window"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "_Disable existing sound for this event"
+
+#, fuzzy
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "_Disable showing event in roster"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "_Disable showing event in roster"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "_Inform me with a pop-up window"
+
+#~ msgid "_Open chat window with user"
+#~ msgstr "_Open chat window with user"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "_Show event in roster"
+
+#~ msgid "and I "
+#~ msgstr "and I "
+
+#, fuzzy
+#~ msgid "contact(s)"
+#~ msgstr "Contacts"
+
+#~ msgid "for "
+#~ msgstr "for "
+
+#, fuzzy
+#~ msgid "group(s)"
+#~ msgstr "Groups"
+
+#~ msgid "when I'm in"
+#~ msgstr "when I'm in"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "_Allow him/her to see my status"
+
+#, fuzzy
+#~ msgid "Descrition:"
+#~ msgstr "Description: "
+
+#~ msgid "Advanced..."
+#~ msgstr "Advanced..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "Display _activity of contacts in roster"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "Display _tunes of contacts in roster"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "Display m_ood of contacts in roster"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "If ticked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+
+#, fuzzy
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr ""
+#~ "If ticked, Gajim will display the mood of contacts in the roster window"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr ""
+#~ "If ticked, Gajim will display the tunes of contacts in the roster window"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Single Message..."
+
+#~ msgid "User avatar:"
+#~ msgstr "User avatar:"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim Instant Messenger"
+
+#~ msgid "English"
+#~ msgstr "English"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belarusian"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarian"
+
+#~ msgid "Breton"
+#~ msgstr "Breton"
+
+#~ msgid "Czech"
+#~ msgstr "Czech"
+
+#~ msgid "German"
+#~ msgstr "German"
+
+#~ msgid "Greek"
+#~ msgstr "Greek"
+
+#~ msgid "British"
+#~ msgstr "British"
+
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanish"
+
+#~ msgid "Basque"
+#~ msgstr "Basque"
+
+#~ msgid "French"
+#~ msgstr "French"
+
+#~ msgid "Croatian"
+#~ msgstr "Croatian"
+
+#~ msgid "Italian"
+#~ msgstr "Italian"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "Norwegian (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "Dutch"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norwegian"
+
+#~ msgid "Polish"
+#~ msgstr "Polish"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portuguese"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Brazilian Portuguese"
+
+#~ msgid "Russian"
+#~ msgstr "Russian"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbian"
+
+#~ msgid "Slovak"
+#~ msgstr "Slovak"
+
+#~ msgid "Swedish"
+#~ msgstr "Swedish"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "Chinese (Ch)"
+
+#~ msgid "Spelling language"
+#~ msgstr "Spelling language"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr ""
+#~ "Change the value to change the size of latex formulae displayed. The "
+#~ "higher is larger."
+
+#~ msgid "all or space separated status"
+#~ msgstr "all or space separated status"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', or 'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' or ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "Check your connection or try again later"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "Error executing \"%(command)s\": %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "error: cannot open %s for reading"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "Unable to bind to port %s."
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "A GTK+ jabber client"
+
+#~ msgid "Condition"
+#~ msgstr "Condition"
+
+#~ msgid "when I am "
+#~ msgstr "when I am "
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Requires gpg and python-GnuPGInterface."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "Transform LaTeX expressions between $$ $$."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to "
+#~ "True in the Advanced Configuration Editor."
+
+#, fuzzy
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in "
+#~ "MikTeX). You have to set 'use_latex' to True in the Advanced "
+#~ "Configuration Editor."
+#~ msgstr ""
+#~ "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to "
+#~ "set 'use_latex' to True in the Advanced Configuration Editor."
+
+#, fuzzy
+#~ msgid "Requires python-farsight."
+#~ msgstr "Requires python-avahi."
+
+#, fuzzy
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+
+#, fuzzy
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr ""
+#~ "Returns current status message (the global one unless account is "
+#~ "specified)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Too many arguments. \n"
+#~ "Type \"%(basename)s help %(command)s\" for more info"
+
+#, fuzzy
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "Argument \"%(arg)s\" is not specified. \n"
+#~ "Type \"%(basename)s help %(command)s\" for more info"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk WriteError"
+
+#~ msgid "Subject: %s"
+#~ msgstr "Subject: %s"
+
+#, fuzzy
+#~ msgid "Mood: %s"
+#~ msgstr "Mood:"
+
+#, fuzzy
+#~ msgid "Activity: %s"
+#~ msgstr "Activity:"
+
 #~ msgid "@"
 #~ msgstr "@"
 
@@ -10509,31 +11743,12 @@ msgstr " resource with priority "
 #~ msgid "Nickname not allowed: %s"
 #~ msgstr "Nickname not allowed: %s"
 
-#~ msgid "Room has been destroyed"
-#~ msgstr "Room has been destroyed"
-
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "You can join this room instead: %s"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "I would like to add you to my roster."
-
 #~ msgid "we are now subscribed to %s"
 #~ msgstr "we are now subscribed to %s"
 
-#~ msgid "unsubscribe request from %s"
-#~ msgstr "unsubscribe request from %s"
-
 #~ msgid "we are now unsubscribed from %s"
 #~ msgstr "we are now unsubscribed from %s"
 
-#~ msgid ""
-#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
-#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
-#~ msgstr ""
-#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
-#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
-
 #~ msgid "Account Modification"
 #~ msgstr "Account Modification"
 
@@ -10636,9 +11851,6 @@ msgstr " resource with priority "
 #~ "Groupchat Histories\n"
 #~ "All Chat Histories"
 
-#~ msgid "Manage Accounts"
-#~ msgstr "Manage Accounts"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -10805,18 +12017,9 @@ msgstr " resource with priority "
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Assign Open_PGP Key"
 
-#~ msgid "Command not supported for zeroconf account."
-#~ msgstr "Command not supported for zeroconf account."
-
 #~ msgid "Commands: %s"
 #~ msgstr "Commands: %s"
 
-#~ msgid "Usage: /%s, clears the text window."
-#~ msgstr "Usage: /%s, clears the text window."
-
-#~ msgid "Usage: /%s, hide the chat buttons."
-#~ msgstr "Usage: /%s, hide the chat buttons."
-
 #~ msgid ""
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
@@ -10824,12 +12027,6 @@ msgstr " resource with priority "
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
 
-#~ msgid "Usage: /%s, sends a ping to the contact"
-#~ msgstr "Usage: /%s, sends a ping to the contact"
-
-#~ msgid "Usage: /%s, send the message to the contact"
-#~ msgstr "Usage: /%s, send the message to the contact"
-
 #~ msgid "No help info for /%s"
 #~ msgstr "No help info for /%s"
 
@@ -10852,9 +12049,6 @@ msgstr " resource with priority "
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface "
 
-#~ msgid "Nickname not found"
-#~ msgstr "Nickname not found"
-
 #~ msgid ""
 #~ "There is an ambiguity: %d nicks match.\n"
 #~ " Please use graphical interface"
@@ -10872,13 +12066,6 @@ msgstr " resource with priority "
 #~ "If the JID is currently in the group chat, he/she/it will also be kicked."
 
 #~ msgid ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-#~ msgstr ""
-#~ "Usage: /%s <nickname>, opens a private chat window with the specified "
-#~ "occupant."
-
-#~ msgid ""
 #~ "Usage: /%s [reason], closes the current window or tab, displaying reason "
 #~ "if specified."
 #~ msgstr ""
@@ -10916,9 +12103,6 @@ msgstr " resource with priority "
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#~ msgid "Usage: /%s , display the names of group chat occupants."
-#~ msgstr "Usage: /%s , display the names of group chat occupants."
-
 #~ msgid ""
 #~ "Usage: /%s [topic], displays or updates the current group chat topic."
 #~ msgstr ""
@@ -10958,9 +12142,6 @@ msgstr " resource with priority "
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
 
-#~ msgid "Show _roster"
-#~ msgstr "Show _roster"
-
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Select the account with which to synchronise"
 
@@ -10977,18 +12158,12 @@ msgstr " resource with priority "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim account %s"
 
-#~ msgid "Duplicate Jabber ID"
-#~ msgstr "Duplicate Jabber ID"
-
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "This account is already configured in Gajim."
 
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "gajim-remote"
-#~ msgstr "gajim-remote"
-
 #~ msgid "OpenGPG"
 #~ msgstr "OpenGPG"
 
@@ -11112,9 +12287,6 @@ msgstr " resource with priority "
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
-#~ msgid "Click to see past conversations with this contact"
-#~ msgstr "Click to see past conversations with this contact"
-
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "_Compact View    Alt+C"
 
@@ -11127,9 +12299,6 @@ msgstr " resource with priority "
 #~ msgid "Query Builder..."
 #~ msgstr "Query Builder..."
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
-
 #~ msgid "Invitation Received"
 #~ msgstr "Invitation Received"
 
@@ -11258,9 +12427,6 @@ msgstr " resource with priority "
 #~ msgid "Company:"
 #~ msgstr "Company:"
 
-#~ msgid "Country:"
-#~ msgstr "Country:"
-
 #~ msgid "Given:"
 #~ msgstr "Given:"
 
@@ -11297,9 +12463,6 @@ msgstr " resource with priority "
 #~ msgid "OS:"
 #~ msgstr "OS:"
 
-#~ msgid "Subscription:"
-#~ msgstr "Subscription:"
-
 #~ 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 "